ARM updates for 4.18, cleanup some dropped config options

1 files changed, 18 insertions, 33 deletions

diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 34b856578..4ae134bb6 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -252,7 +252,6 @@ CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_S3C24XX is not set
 # CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_SHMOBILE_MULTI is not set
 # CONFIG_ARCH_SIRF is not set
 # CONFIG_ARCH_SOCFPGA is not set
 CONFIG_ARCH_STI=y
@@ -297,7 +296,7 @@ CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
 CONFIG_ARM_BIG_LITTLE_CPUIDLE=y
 CONFIG_ARM_CCI400_PMU=y
 CONFIG_ARM_CCI5xx_PMU=y
-# CONFIG_ARM_CCI_PMU is not set
+CONFIG_ARM_CCI_PMU=m
 CONFIG_ARM_CCI=y
 CONFIG_ARM_CCN=y
 # CONFIG_ARM_CHARLCD is not set
@@ -354,7 +353,7 @@ CONFIG_ARM_PMU=y
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
 # CONFIG_ARM_PTDUMP is not set
-# CONFIG_ARM_QCOM_CPUFREQ_KRYO is not set
+CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCMI_CPUFREQ=m
 CONFIG_ARM_SCMI_POWER_DOMAIN=m
@@ -368,7 +367,7 @@ CONFIG_ARM_SPE_PMU=m
 CONFIG_ARM_STI_CPUFREQ=m
 CONFIG_ARM_TEGRA124_CPUFREQ=m
 CONFIG_ARM_TEGRA186_CPUFREQ=m
-# CONFIG_ARM_TEGRA20_CPUFREQ is not set
+CONFIG_ARM_TEGRA20_CPUFREQ=m
 CONFIG_ARM_TEGRA_DEVFREQ=m
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_THUMB=y
@@ -576,7 +575,7 @@ CONFIG_BAYCOM_SER_HDX=m
 CONFIG_BCACHE=m
 CONFIG_BCM2835_MBOX=y
 CONFIG_BCM2835_THERMAL=m
-# CONFIG_BCM2835_VCHIQ is not set
+CONFIG_BCM2835_VCHIQ=m
 CONFIG_BCM2835_WDT=m
 CONFIG_BCM63XX_PHY=m
 # CONFIG_BCM7038_WDT is not set
@@ -1213,7 +1212,6 @@ CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
 CONFIG_CRYPTO_SM4=m
 CONFIG_CRYPTO_SPECK=m
 CONFIG_CRYPTO_SPECK_NEON=m
@@ -1451,17 +1449,17 @@ CONFIG_DRM_EXYNOS7_DECON=y
 CONFIG_DRM_EXYNOS_DPI=y
 CONFIG_DRM_EXYNOS_DP=y
 CONFIG_DRM_EXYNOS_DSI=y
-# CONFIG_DRM_EXYNOS_FIMC is not set
+CONFIG_DRM_EXYNOS_FIMC=y
 CONFIG_DRM_EXYNOS_FIMD=y
 CONFIG_DRM_EXYNOS_G2D=y
-# CONFIG_DRM_EXYNOS_GSC is not set
+CONFIG_DRM_EXYNOS_GSC=y
 CONFIG_DRM_EXYNOS_HDMI=y
 CONFIG_DRM_EXYNOS_IOMMU=y
 CONFIG_DRM_EXYNOS=m
 CONFIG_DRM_EXYNOS_MIC=y
 CONFIG_DRM_EXYNOS_MIXER=y
-# CONFIG_DRM_EXYNOS_ROTATOR is not set
-# CONFIG_DRM_EXYNOS_SCALER is not set
+CONFIG_DRM_EXYNOS_ROTATOR=y
+CONFIG_DRM_EXYNOS_SCALER=y
 CONFIG_DRM_EXYNOS_VIDI=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
@@ -1563,7 +1561,7 @@ CONFIG_DRM_SUN4I_BACKEND=m
 CONFIG_DRM_SUN4I_HDMI_CEC=y
 CONFIG_DRM_SUN4I_HDMI=m
 CONFIG_DRM_SUN4I=m
-# CONFIG_DRM_SUN6I_DSI is not set
+CONFIG_DRM_SUN6I_DSI=m
 CONFIG_DRM_SUN8I_DW_HDMI=m
 CONFIG_DRM_SUN8I_MIXER=m
 # CONFIG_DRM_TDFX is not set
@@ -1896,7 +1894,7 @@ CONFIG_FIREWIRE_SBP2=m
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
-CONFIG_FIXED_PHY=y
+CONFIG_FIXED_PHY=m
 CONFIG_FLATMEM_MANUAL=y
 CONFIG_FM10K=m
 CONFIG_FMC_CHARDEV=m
@@ -2012,7 +2010,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX3191X is not set
 # CONFIG_GPIO_MAX7300 is not set
 CONFIG_GPIO_MAX7301=m
-# CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_MAX732X=m
 # CONFIG_GPIO_MB86S7X is not set
 CONFIG_GPIO_MC33880=m
 # CONFIG_GPIO_MCP23S08 is not set
@@ -2383,7 +2381,6 @@ CONFIG_I40EVF=m
 CONFIG_I6300ESB_WDT=m
 CONFIG_I82092=m
 # CONFIG_IAQCORE is not set
-# CONFIG_IBMVMC is not set
 CONFIG_ICE=m
 CONFIG_ICPLUS_PHY=m
 # CONFIG_ICS932S401 is not set
@@ -2425,7 +2422,7 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
-# CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@@ -2666,7 +2663,6 @@ CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_HANDLER=m
 # CONFIG_IPMI_PANIC_EVENT is not set
 CONFIG_IPMI_POWEROFF=m
-# CONFIG_IPMI_PROC_INTERFACE is not set
 CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
 CONFIG_IPMI_WATCHDOG=m
@@ -2776,7 +2772,6 @@ CONFIG_IPVTAP=m
 # CONFIG_IPW2200_DEBUG is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IPWIRELESS=m
-# CONFIG_IPX is not set
 # CONFIG_IRDA is not set
 CONFIG_IR_ENE=m
 CONFIG_IR_FINTEK=m
@@ -3190,7 +3185,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=32768
 # CONFIG_LTC2632 is not set
 # CONFIG_LTE_GDM724X is not set
 # CONFIG_LTR501 is not set
-# CONFIG_LUSTRE_FS is not set
 CONFIG_LV0104CS=m
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_LWTUNNEL=y
@@ -3292,6 +3286,7 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
+CONFIG_MDIO_DEVICE=m
 CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
 CONFIG_MDIO_I2C=m
@@ -3795,7 +3790,6 @@ CONFIG_NATIONAL_PHY=m
 CONFIG_NATSEMI=m
 # CONFIG_NAU7802 is not set
 # CONFIG_NBPFAXI_DMA is not set
-# CONFIG_NCP_FS is not set
 # CONFIG_ND_BLK is not set
 CONFIG_NE2K_PCI=m
 CONFIG_NEON=y
@@ -4357,7 +4351,7 @@ CONFIG_OF_FLATTREE=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=y
+CONFIG_OF_MDIO=m
 CONFIG_OF_NET=y
 CONFIG_OF_OVERLAY=y
 CONFIG_OF_PMEM=m
@@ -4394,8 +4388,6 @@ CONFIG_OMAP_INTERCONNECT=y
 # CONFIG_OMAP_IOMMU_DEBUG is not set
 CONFIG_OMAP_IOMMU=y
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
-CONFIG_OMAP_MUX_WARNINGS=y
-CONFIG_OMAP_MUX=y
 CONFIG_OMAP_OCP2SCP=m
 CONFIG_OMAP_PACKAGE_CBB=y
 CONFIG_OMAP_PACKAGE_CUS=y
@@ -4517,20 +4509,16 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIEASPM=y
 CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_DPC=y
-# CONFIG_PCIE_DW_HOST_ECAM is not set
 CONFIG_PCIE_DW_HOST=y
-# CONFIG_PCIE_DW_PLAT_HOST is not set
-# CONFIG_PCIE_DW_PLAT is not set
+CONFIG_PCIE_DW_PLAT_HOST=y
 CONFIG_PCIE_DW=y
 CONFIG_PCIE_ECRC=y
-CONFIG_PCIE_HISI_STB=y
 # CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCI_ENDPOINT_TEST is not set
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
-# CONFIG_PCIE_ROCKCHIP_HOST is not set
-CONFIG_PCIE_ROCKCHIP=y
+CONFIG_PCIE_ROCKCHIP_HOST=m
 CONFIG_PCIE_XILINX=y
 CONFIG_PCI_EXYNOS=y
 # CONFIG_PCI_FTPCI100 is not set
@@ -4588,7 +4576,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=m
 CONFIG_PHY_EXYNOS_PCIE=y
-CONFIG_PHYLIB=y
+CONFIG_PHYLIB=m
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
@@ -5011,7 +4999,7 @@ CONFIG_REGULATOR_RK808=m
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
-# CONFIG_REGULATOR_SY8106A is not set
+CONFIG_REGULATOR_SY8106A=m
 CONFIG_REGULATOR_TI_ABB=m
 CONFIG_REGULATOR_TPS51632=m
 CONFIG_REGULATOR_TPS62360=m
@@ -6341,7 +6329,6 @@ CONFIG_ST_UVIS25_SPI=m
 CONFIG_SUN4I_A10_CCU=y
 CONFIG_SUN4I_EMAC=m
 CONFIG_SUN4I_GPADC=m
-# CONFIG_SUN50I_H6_R_CCU is not set
 CONFIG_SUN5I_CCU=y
 CONFIG_SUN6I_A31_CCU=y
 CONFIG_SUN8I_A23_CCU=y
@@ -6368,7 +6355,6 @@ CONFIG_SUNXI_WATCHDOG=m
 # CONFIG_SURFACE_3_BUTTON is not set
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
-CONFIG_SWIOTLB=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_SX9500 is not set
@@ -6451,7 +6437,6 @@ CONFIG_TCS3472=m
 # CONFIG_TEE is not set
 CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
-CONFIG_TEGRA20_MC=y
 CONFIG_TEGRA_AHB=y
 # CONFIG_TEGRA_BPMP is not set
 CONFIG_TEGRA_GMI=m