Linux v4.9.4 rebase

1 files changed, 25 insertions, 27 deletions

diff --git a/config-armv7-generic b/config-armv7-generic
index f36ed38b0..ffc6b526a 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -21,9 +21,9 @@ CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_ASM_UNIFIED=y
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_CPU_TOPOLOGY=y
-CONFIG_ARM_DMA_MEM_BUFFERABLE=y
 CONFIG_SWP_EMULATE=y
 CONFIG_CACHE_L2X0=y
+CONFIG_CACHE_L2X0_PMU=y
 CONFIG_HIGHPTE=y
 CONFIG_AUTO_ZRELADDR=y
 CONFIG_ATAGS=y
@@ -135,6 +135,7 @@ CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y
 CONFIG_DEVFREQ_GOV_POWERSAVE=y
 CONFIG_DEVFREQ_GOV_USERSPACE=y
+# CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI is not set
 
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_LSM_MMAP_MIN_ADDR=32768
@@ -166,10 +167,8 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_APPENDED_DTB=y
 
 # General vexpress ARM drivers
-CONFIG_SERIO_AMBAKMI=m
 CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-
 CONFIG_RTC_DRV_PL030=y
 CONFIG_AMBA_PL08X=y
 CONFIG_SND_ARMAACI=m
@@ -191,6 +190,9 @@ CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 CONFIG_MACH_SUN9I=y
 CONFIG_SUNXI_CCU=y
+CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN8I_A23_CCU=y
+CONFIG_SUN8I_A33_CCU=y
 CONFIG_SUN8I_H3_CCU=y
 CONFIG_SUNXI_SRAM=y
 CONFIG_DMA_SUN4I=m
@@ -235,7 +237,10 @@ CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SUN4I_I2S=m
-CONFIG_SUNXI_RSB=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SUNXI_RSB=y
+CONFIG_MFD_AC100=m
+CONFIG_RTC_DRV_AC100=m
 CONFIG_NVMEM_SUNXI_SID=m
 
 # Exynos
@@ -254,7 +259,6 @@ CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_ARM_EXYNOS5440_CPUFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_EXYNOS5420_MCPM=y
-CONFIG_ARM_EXYNOS5_BUS_DEVFREQ=m
 # CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
 # CONFIG_EXYNOS5420_MCPM not set
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
@@ -319,19 +323,27 @@ 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
 # CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
 CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
 
+CONFIG_MFD_EXYNOS_LPASS=m
 CONFIG_SND_SOC_SAMSUNG=m
 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_ODROIDX2=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98095=m
+CONFIG_SND_SAMSUNG_I2S=m
+CONFIG_SND_SAMSUNG_PCM=m
+CONFIG_SND_SAMSUNG_SPDIF=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
+CONFIG_MFD_EXYNOS_LPASS=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
 # CONFIG_SAMSUNG_PM_DEBUG is not set
 # CONFIG_SAMSUNG_PM_CHECK is not set
@@ -446,17 +458,11 @@ CONFIG_MFD_TPS65912_SPI=y
 # CONFIG_MFD_TPS80031 is not set
 # CONFIG_TWL4030_CORE is not set
 # CONFIG_TWL6040_CORE is not set
-# 
 
 # Pin stuff
 # CONFIG_PINCTRL_AMD is not set
 # CONFIG_PINCTRL_SAMSUNG is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
 # CONFIG_PINCTRL_BCM281XX is not set
-# CONFIG_PINCTRL_APQ8064 is not set
-# CONFIG_PINCTRL_APQ8084 is not set
-# CONFIG_PINCTRL_MSM8960 is not set
-# CONFIG_PINCTRL_MSM8660 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 
@@ -468,6 +474,7 @@ CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TPS65912=m
 # CONFIG_GPIO_ZEVIO is not set
+CONFIG_GPIO_AXP209=m
 CONFIG_LEDS_GPIO=m
 CONFIG_LEDS_GPIO_REGISTER=y
 CONFIG_MDIO_BUS_MUX=m
@@ -478,7 +485,6 @@ CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_INPUT_MATRIXKMAP=m
 CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_GPIO_RCAR is not set
 CONFIG_W1_MASTER_GPIO=m
 
 # HW crypto and rng
@@ -526,6 +532,8 @@ CONFIG_EEPROM_93XX46=m
 CONFIG_SND_ARM=y
 CONFIG_SND_SOC_AC97_BUS=y
 CONFIG_SND_SOC_AC97_CODEC=y
+# CONFIG_SND_SOC_RK3399_GRU_SOUND is not set
+# CONFIG_SND_SOC_TEGRA_SGTL5000 is not set
 
 # RTC
 CONFIG_RTC_DRV_DS1305=m
@@ -592,16 +600,15 @@ CONFIG_GENERIC_ADC_BATTERY=m
 CONFIG_BATTERY_SBS=m
 
 # Sensors
+# non iio
 CONFIG_SENSORS_AD7314=m
-CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_BH1780=m
 CONFIG_SENSORS_GPIO_FAN=m
-CONFIG_SENSORS_ISL29018=m
-CONFIG_SENSORS_ISL29028=m
-CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_MAX1111=m
+# iio
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
 CONFIG_MPL115=m
 CONFIG_MPL3115=m
 CONFIG_SI7005=m
@@ -634,7 +641,6 @@ CONFIG_LEDS_TRIGGER_CPU=y
 CONFIG_LEDS_DAC124S085=m
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_SYSCON=y
-CONFIG_BMP085_SPI=m
 
 CONFIG_MFD_SYSCON=y
 CONFIG_GPIO_SYSCON=m
@@ -685,13 +691,8 @@ CONFIG_CROS_EC_CHARDEV=m
 CONFIG_CROS_EC_PROTO=y
 CONFIG_PWM_CROS_EC=m
 
-# This newly introduced mess needs to be fixed upstream :-(
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
-# CONFIG_DWMAC_LPC18XX is not set
-# CONFIG_DWMAC_MESON is not set
-# CONFIG_DWMAC_SOCFPGA is not set
-# CONFIG_DWMAC_STI is not set
 
 CONFIG_R8188EU=m
 
@@ -711,8 +712,6 @@ CONFIG_R8188EU=m
 # CONFIG_DRM_IMX is not set
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_FSL_DCU is not set
-# CONFIG_AHCI_IMX is not set
-# CONFIG_IMX_THERMAL is not set
 # CONFIG_TI_DAC7512 is not set
 
 # Not needed on ARMv7
@@ -767,6 +766,7 @@ CONFIG_R8188EU=m
 # CONFIG_QCOM_SPMI_TEMP_ALARM is not set
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 # CONFIG_SND_SOC_TAS571X is not set
+# CONFIG_QCOM_EBI2 is not set
 
 # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set
 
@@ -779,6 +779,4 @@ CONFIG_R8188EU=m
 # CONFIG_DMADEVICES_DEBUG is not set
 # CONFIG_SERIAL_SAMSUNG_DEBUG is not set
 # CONFIG_OMAP2_DSS_DEBUG is not set
-# CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
-# CONFIG_AB8500_DEBUG is not set
 # CONFIG_DEBUG_LL is not set