From e7ad6855f5641750963559d88a34fb0168ea620d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 20 Nov 2016 12:31:00 +0000 Subject: [PATCH] Various ARMv7/aarch64 updates, Enable CEC media input devices, General config cleanups (NFC) --- config-arm-generic | 3 ++- config-armv7 | 3 --- config-armv7-generic | 9 ++++++- config-armv7-lpae | 1 + config-generic | 55 ++++++++-------------------------------- config-powerpc64 | 1 + config-powerpc64-generic | 1 + config-x86-generic | 17 +++++++++++++ kernel.spec | 5 ++++ 9 files changed, 45 insertions(+), 50 deletions(-) diff --git a/config-arm-generic b/config-arm-generic index e13cc6027..f52f5347e 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -172,6 +172,7 @@ CONFIG_SERIAL_MVEBU_CONSOLE=y CONFIG_MVEBU_DEVBUS=y CONFIG_MVEBU_MBUS=y CONFIG_PCI_MVEBU=y +CONFIG_PCI_AARDVARK=y CONFIG_PCIE_ARMADA_8K=y CONFIG_MV_XOR=y CONFIG_CRYPTO_DEV_MV_CESA=m @@ -197,9 +198,9 @@ CONFIG_USB_MV_UDC=m CONFIG_USB_XHCI_MVEBU=m CONFIG_PHY_MVEBU_SATA=y CONFIG_AHCI_MVEBU=m +CONFIG_I2C_PXA=m # CONFIG_CACHE_FEROCEON_L2 is not set # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set -# CONFIG_PCI_AARDVARK is not set # Rockchips CONFIG_ARCH_ROCKCHIP=y diff --git a/config-armv7 b/config-armv7 index 298c8d790..0bd02c47e 100644 --- a/config-armv7 +++ b/config-armv7 @@ -23,8 +23,6 @@ CONFIG_SOC_OMAP5=y # CONFIG_SOC_DRA7XX is not set CONFIG_SOC_OMAP3430=y CONFIG_SOC_TI81XX=y -# CONFIG_MACH_NOKIA_RX51 is not set -# CONFIG_MACH_OMAP_LDP is not set # CONFIG_MACH_OMAP3517EVM is not set # CONFIG_MACH_OMAP3_PANDORA is not set CONFIG_OMAP5_ERRATA_801819=y @@ -520,7 +518,6 @@ CONFIG_MACH_MMP2_DT=y CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_KEYBOARD_PXA27x=y -CONFIG_I2C_PXA=m # CONFIG_I2C_PXA_SLAVE is not set CONFIG_SND_MMP_SOC=y CONFIG_SND_PXA910_SOC=m diff --git a/config-armv7-generic b/config-armv7-generic index ec9a51928..03e2aface 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -323,6 +323,7 @@ CONFIG_VIDEO_EXYNOS4_FIMC_IS=m CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y CONFIG_VIDEO_S5P_FIMC=m CONFIG_VIDEO_S5P_MIPI_CSIS=m +CONFIG_VIDEO_SAMSUNG_S5P_CEC=m CONFIG_VIDEO_SAMSUNG_S5P_G2D=m CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m CONFIG_VIDEO_SAMSUNG_S5P_MFC=m @@ -335,6 +336,9 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m CONFIG_SND_SOC_SMDK_WM8994_PCM=m CONFIG_SND_SOC_SNOW=m +CONFIG_SND_SOC_MAX98090=m +CONFIG_SND_SOC_MAX98095=m +CONFIG_SND_SAMSUNG_I2S=m CONFIG_EXYNOS_AUDSS_CLK_CON=m # CONFIG_EXYNOS_IOMMU_DEBUG is not set # CONFIG_SAMSUNG_PM_DEBUG is not set @@ -356,6 +360,7 @@ CONFIG_LEDS_MAX8997=m CONFIG_RTC_DRV_MAX8997=m CONFIG_EXTCON_MAX8997=m CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m +CONFIG_SND_SOC_RT5631=m # Tegra CONFIG_ARCH_TEGRA_114_SOC=y @@ -406,9 +411,11 @@ CONFIG_USB_EHCI_HCD_ORION=m CONFIG_MVPP2=m CONFIG_COMMON_CLK_SI5351=m CONFIG_RTC_DRV_ARMADA38X=m +CONFIG_I2C_PXA=m # CONFIG_CACHE_FEROCEON_L2 is not set # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set CONFIG_LEDS_NS2=m +CONFIG_LEDS_PCA963X=m # CONFIG_PCIE_ARMADA_8K is not set # DRM panels @@ -473,7 +480,7 @@ CONFIG_GPIO_MC33880=m CONFIG_GPIO_TPS65910=y CONFIG_GPIO_TPS65912=m # CONFIG_GPIO_ZEVIO is not set -# CONFIG_GPIO_AXP209 is not set +CONFIG_GPIO_AXP209=m CONFIG_LEDS_GPIO=m CONFIG_LEDS_GPIO_REGISTER=y CONFIG_MDIO_BUS_MUX=m diff --git a/config-armv7-lpae b/config-armv7-lpae index a7b24e150..18126dde8 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -46,6 +46,7 @@ CONFIG_TI_SYSCON_RESET=m CONFIG_USB_DWC3_KEYSTONE=m CONFIG_GPIO_DAVINCI=y # CONFIG_I2C_DAVINCI is not set +# CONFIG_MTD_NAND_OMAP2 is not set CONFIG_TI_AEMIF=m CONFIG_POWER_RESET_KEYSTONE=y CONFIG_DAVINCI_WATCHDOG=m diff --git a/config-generic b/config-generic index 6b141c94a..36600d849 100644 --- a/config-generic +++ b/config-generic @@ -219,19 +219,14 @@ CONFIG_BINFMT_MISC=m # CONFIG_COMMON_CLK_SI5351 is not set # CONFIG_COMMON_CLK_CDCE706 is not set +# CONFIG_COMMON_CLK_CDCE925 is not set # CONFIG_COMMON_CLK_CS2000_CP is not set # CONFIG_COMMON_CLK_PWM is not set -# CONFIG_COMMON_CLK_CDCE925 is not set -# CONFIG_COMMON_CLK_OXNAS is not set # CONFIG_COMMON_CLK_HI3519 is not set -# CONFIG_SUNXI_CCU is not set -# CONFIG_COMMON_CLK_MT8135 is not set -# CONFIG_COMMON_CLK_MT8173 is not set # CONFIG_SUN6I_A31_CCU is not set # CONFIG_SUN8I_A23_CCU is not set # CONFIG_SUN8I_A33_CCU is not set - # # Generic Driver Options # @@ -348,7 +343,6 @@ CONFIG_MTD_CFI_I2=y # CONFIG_MTD_NAND_HISI504 is not set # CONFIG_MTD_NAND_DENALI_PCI is not set # CONFIG_MTD_NAND_DENALI_DT is not set -# CONFIG_MTD_NAND_OMAP2 is not set # CONFIG_MTD_LPDDR is not set CONFIG_MTD_UBI=m CONFIG_MTD_UBI_WL_THRESHOLD=4096 @@ -614,11 +608,11 @@ CONFIG_SCSI_SNIC=m CONFIG_ATA=y CONFIG_ATA_BMDMA=y +CONFIG_ATA_GENERIC=m CONFIG_ATA_VERBOSE_ERROR=y CONFIG_ATA_SFF=y CONFIG_ATA_PIIX=y # CONFIG_SATA_DWC is not set -# CONFIG_SATA_HIGHBANK is not set CONFIG_ATA_ACPI=y CONFIG_BLK_DEV_SX8=m CONFIG_PDC_ADMA=m @@ -657,7 +651,6 @@ CONFIG_PATA_CS5535=m CONFIG_PATA_CS5536=m CONFIG_PATA_CYPRESS=m CONFIG_PATA_EFAR=m -CONFIG_ATA_GENERIC=m CONFIG_PATA_HPT366=m CONFIG_PATA_HPT37X=m CONFIG_PATA_HPT3X2N=m @@ -2078,6 +2071,9 @@ CONFIG_HAMRADIO=y CONFIG_AX25=m CONFIG_AX25_DAMA_SLAVE=y +# +# Controller Area Network support +# CONFIG_CAN=m CONFIG_CAN_RAW=m CONFIG_CAN_BCM=m @@ -3389,25 +3385,9 @@ CONFIG_R3964=m # CONFIG_APPLICOM is not set # CONFIG_SONYPI is not set -# -# AGP Support -# -CONFIG_AGP=y -CONFIG_AGP_ALI=y -CONFIG_AGP_ATI=y -CONFIG_AGP_AMD=y -CONFIG_AGP_AMD64=y -CONFIG_AGP_INTEL=y -CONFIG_AGP_NVIDIA=y -CONFIG_AGP_SIS=y -CONFIG_AGP_SWORKS=y -CONFIG_AGP_VIA=y -CONFIG_AGP_EFFICEON=y - CONFIG_VGA_ARB=y CONFIG_VGA_ARB_MAX_GPUS=16 - CONFIG_DRM=m CONFIG_DRM_ANALOGIX_ANX78XX=m # CONFIG_DRM_ARCPGU is not set @@ -3458,7 +3438,6 @@ CONFIG_DRM_VIRTIO_GPU=m # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set CONFIG_DRM_VGEM=m -# CONFIG_DRM_MALI_DISPLAY is not set # CONFIG_DRM_SII902X is not set # CONFIG_DRM_TOSHIBA_TC358767 is not set # CONFIG_DRM_I2C_ADV7533 is not set @@ -4105,10 +4084,9 @@ CONFIG_USB_UAS=m # # USB Human Interface Devices (HID) # -CONFIG_USB_HID=y - CONFIG_HID=y +CONFIG_USB_HID=y CONFIG_I2C_HID=m CONFIG_HID_BATTERY_STRENGTH=y # debugging default is y upstream now @@ -4873,11 +4851,10 @@ CONFIG_UNIXWARE_DISKLABEL=y # CONFIG_ULTRIX_PARTITION is not set # CONFIG_CMDLINE_PARTITION is not set -CONFIG_NLS=y - # # Native Language Support # +CONFIG_NLS=y CONFIG_NLS_DEFAULT="utf8" CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_737=m @@ -5059,7 +5036,6 @@ CONFIG_SECCOMP=y CONFIG_STRICT_DEVMEM=y CONFIG_IO_STRICT_DEVMEM=y - # # Cryptographic options # @@ -5151,10 +5127,6 @@ CONFIG_CRYPTO_DRBG_HASH=y CONFIG_CRYPTO_DRBG_CTR=y CONFIG_CRYPTO_KEYWRAP=m - - -# Random number generation - # # Library routines # @@ -5323,8 +5295,6 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_STAT_DETAILS=y - - # CONFIG_MOUSE_ATIXL is not set CONFIG_RADIO_ADAPTERS=y @@ -5432,7 +5402,6 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y # CONFIG_SND_SOC_TLV320AIC31XX is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_CS4265 is not set -# CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_FSL_ASOC_CARD is not set # CONFIG_SND_EDMA_SOC is not set # CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set @@ -5461,8 +5430,6 @@ CONFIG_SND_SOC_AMD_ACP=m # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SIMPLE_SCU_CARD is not set - - CONFIG_BALLOON_COMPACTION=y CONFIG_COMPACTION=y CONFIG_MIGRATION=y @@ -5481,8 +5448,6 @@ CONFIG_LEDS_CLASS_FLASH=m # CONFIG_LEDS_TLC591XX is not set # CONFIG_LEDS_KTD2692 is not set # CONFIG_LEDS_AAT1290 is not set -# -CONFIG_LEDS_DELL_NETBOOKS=m # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_LM355x is not set # CONFIG_LEDS_OT200 is not set @@ -5767,7 +5732,9 @@ CONFIG_STAGING=y # CONFIG_GREYBUS is not set # CONFIG_STAGING_BOARD is not set CONFIG_STAGING_MEDIA=y -# CONFIG_MEDIA_CEC is not set +CONFIG_MEDIA_CEC=y +# CONFIG_MEDIA_CEC_DEBUG is not set +CONFIG_USB_PULSE8_CEC=m # CONFIG_DVB_AS102 is not set # CONFIG_SLICOSS is not set # CONFIG_VIDEO_DT3155 is not set @@ -6056,8 +6023,6 @@ CONFIG_POWERCAP=y CONFIG_CPU_IDLE=y # CONFIG_CPU_IDLE_GOV_LADDER is not set -# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set - # CONFIG_HMC_DRV is not set # CONFIG_PM_DEVFREQ is not set diff --git a/config-powerpc64 b/config-powerpc64 index b0708a94f..5729ee5d0 100644 --- a/config-powerpc64 +++ b/config-powerpc64 @@ -96,6 +96,7 @@ CONFIG_WINDFARM_PM121=y CONFIG_CPU_FREQ_PMAC64=y CONFIG_SERIAL_PMACZILOG=m # CONFIG_SERIAL_PMACZILOG_TTYS is not set +CONFIG_AGP=y CONFIG_AGP_UNINORTH=y # CONFIG_PMAC_BACKLIGHT_LEGACY is not set diff --git a/config-powerpc64-generic b/config-powerpc64-generic index 9672938bf..88f16569e 100644 --- a/config-powerpc64-generic +++ b/config-powerpc64-generic @@ -183,6 +183,7 @@ CONFIG_FB_MATROX_G=y # CONFIG_FB_VGA16 is not set # CONFIG_FB_ATY128 is not set # CONFIG_FB_ATY is not set +# CONFIG_AGP is not set # CONFIG_SND_SOC is not set # CONFIG_INPUT_PCSPKR is not set diff --git a/config-x86-generic b/config-x86-generic index 27163239a..d4fbe5957 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -279,6 +279,21 @@ CONFIG_PVPANIC=m CONFIG_TOUCHSCREEN_GOODIX=m CONFIG_TOUCHSCREEN_SURFACE3_SPI=m +# +# AGP Support +# +CONFIG_AGP=y +CONFIG_AGP_ALI=y +CONFIG_AGP_ATI=y +CONFIG_AGP_AMD=y +CONFIG_AGP_AMD64=y +CONFIG_AGP_INTEL=y +CONFIG_AGP_NVIDIA=y +CONFIG_AGP_SIS=y +CONFIG_AGP_SWORKS=y +CONFIG_AGP_VIA=y +CONFIG_AGP_EFFICEON=y + # CONFIG_SMSC37B787_WDT is not set CONFIG_VIA_WDT=m CONFIG_IE6XX_WDT=m @@ -353,6 +368,8 @@ CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y # CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set +CONFIG_LEDS_DELL_NETBOOKS=m + CONFIG_MACINTOSH_DRIVERS=y CONFIG_DMIID=y diff --git a/kernel.spec b/kernel.spec index 361c83e41..1c2e5bd2c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2157,6 +2157,11 @@ fi # # %changelog +* Sat Nov 19 2016 Peter Robinson +- Various ARMv7/aarch64 updates +- Enable CEC media input devices +- General config cleanups + * Fri Nov 18 2016 Laura Abbott - 4.9.0-0.rc5.git4.1 - Linux v4.9-rc5-264-g6238986