ARM updates for 4.18, cleanup some dropped config options

1 files changed, 22 insertions, 31 deletions

diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index e5bbf8438..dcdd9fbbf 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -312,7 +312,7 @@ CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
 # CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
 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
@@ -334,7 +334,7 @@ CONFIG_ARM_PMU=y
 CONFIG_ARM_PSCI=y
 CONFIG_ARM_PTDUMP_DEBUGFS=y
 CONFIG_ARM_PTDUMP=y
-# CONFIG_ARM_QCOM_CPUFREQ_KRYO is not set
+CONFIG_ARM_QCOM_CPUFREQ_KRYO=m
 CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SBSA_WATCHDOG=m
 CONFIG_ARM_SCMI_CPUFREQ=m
@@ -536,7 +536,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
@@ -1169,7 +1169,7 @@ CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_SM3_ARM64_CE=m
 CONFIG_CRYPTO_SM3=m
-# CONFIG_CRYPTO_SM4_ARM64_CE is not set
+CONFIG_CRYPTO_SM4_ARM64_CE=m
 CONFIG_CRYPTO_SM4=m
 CONFIG_CRYPTO_SPECK=m
 CONFIG_CRYPTO_SPECK_NEON=m
@@ -1395,10 +1395,6 @@ CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_CEC=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI=m
-# CONFIG_DRM_EXYNOS_FIMC is not set
-# CONFIG_DRM_EXYNOS_GSC is not set
-# CONFIG_DRM_EXYNOS_ROTATOR is not set
-# CONFIG_DRM_EXYNOS_SCALER is not set
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_HDLCD=m
@@ -1476,7 +1472,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
@@ -1799,7 +1795,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
@@ -2281,7 +2277,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
@@ -2323,7 +2318,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
@@ -2546,7 +2541,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
@@ -2656,7 +2650,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
@@ -3059,7 +3052,6 @@ CONFIG_LSM_MMAP_MIN_ADDR=65536
 # 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
@@ -3141,6 +3133,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=m
 CONFIG_MDIO_I2C=m
@@ -3601,7 +3594,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=m
 CONFIG_ND_BTT=m
 CONFIG_NE2K_PCI=m
@@ -4160,7 +4152,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
@@ -4277,10 +4269,8 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIEASPM=y
 CONFIG_PCIE_CADENCE_HOST=y
 CONFIG_PCIE_DPC=y
-CONFIG_PCIE_DW_HOST_ECAM=y
 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
@@ -4290,8 +4280,7 @@ CONFIG_PCIE_KIRIN=y
 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_NWL=y
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_GOOLPC is not set
@@ -4347,7 +4336,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHY_HISI_INNO_USB2=m
 CONFIG_PHY_HISTB_COMBPHY=m
-CONFIG_PHYLIB=y
+CONFIG_PHYLIB=m
 CONFIG_PHYLINK=m
 # CONFIG_PHY_MAPPHONE_MDM6600 is not set
 CONFIG_PHY_MESON8B_USB2=m
@@ -4556,19 +4545,19 @@ CONFIG_PWRSEQ_SIMPLE=y
 CONFIG_QCOM_A53PLL=m
 CONFIG_QCOM_ADSP_PIL=m
 CONFIG_QCOM_APCS_IPC=m
-# CONFIG_QCOM_APR is not set
+CONFIG_QCOM_APR=m
 CONFIG_QCOM_BAM_DMA=y
 CONFIG_QCOM_CLK_APCS_MSM8916=m
 CONFIG_QCOM_CLK_RPM=m
 CONFIG_QCOM_CLK_SMD_RPM=m
 CONFIG_QCOM_COINCELL=m
-# CONFIG_QCOM_COMMAND_DB is not set
+CONFIG_QCOM_COMMAND_DB=y
 # CONFIG_QCOM_EBI2 is not set
 CONFIG_QCOM_EMAC=m
 # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
-# CONFIG_QCOM_GENI_SE is not set
+CONFIG_QCOM_GENI_SE=m
 # CONFIG_QCOM_GLINK_SSR is not set
 CONFIG_QCOM_GSBI=y
 CONFIG_QCOM_HIDMA=m
@@ -4737,7 +4726,7 @@ CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
 CONFIG_REGULATOR_RK808=m
-# CONFIG_REGULATOR_SY8106A is not set
+CONFIG_REGULATOR_SY8106A=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
@@ -5374,6 +5363,7 @@ CONFIG_SERIAL_MVEBU_UART=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 CONFIG_SERIAL_OF_PLATFORM=y
 # CONFIG_SERIAL_PCH_UART is not set
+CONFIG_SERIAL_QCOM_GENI=m
 # CONFIG_SERIAL_RP2 is not set
 # CONFIG_SERIAL_SC16IS7XX is not set
 # CONFIG_SERIAL_SCCNXP is not set
@@ -5665,6 +5655,7 @@ CONFIG_SND_SOC_MAX9867=m
 CONFIG_SND_SOC_MAX98927=m
 CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
 CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_MSM8996=m
 # CONFIG_SND_SOC_MT6351 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
@@ -5682,6 +5673,7 @@ CONFIG_SND_SOC_PCM512x_I2C=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_SPI=m
 CONFIG_SND_SOC_QCOM=m
+CONFIG_SND_SOC_QDSP6=m
 CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m
 CONFIG_SND_SOC_RK3399_GRU_SOUND=m
 CONFIG_SND_SOC_ROCKCHIP_I2S=m
@@ -5835,7 +5827,7 @@ CONFIG_SPI_GPIO=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
-# CONFIG_SPI_MEM is not set
+CONFIG_SPI_MEM=y
 # CONFIG_SPI_MESON_SPICC is not set
 CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_OC_TINY is not set
@@ -5924,7 +5916,7 @@ CONFIG_ST_UVIS25_SPI=m
 CONFIG_SUN4I_GPADC=m
 CONFIG_SUN50I_A64_CCU=y
 CONFIG_SUN50I_H6_CCU=y
-# CONFIG_SUN50I_H6_R_CCU is not set
+CONFIG_SUN50I_H6_R_CCU=y
 # CONFIG_SUN8I_A83T_CCU is not set
 CONFIG_SUN8I_DE2_CCU=y
 CONFIG_SUN8I_H3_CCU=y
@@ -5945,7 +5937,6 @@ CONFIG_SUNXI_WATCHDOG=m
 # CONFIG_SURFACE_3_BUTTON is not set
 CONFIG_SUSPEND=y
 CONFIG_SWAP=y
-CONFIG_SWIOTLB=y
 # CONFIG_SW_SYNC is not set
 # CONFIG_SX9500 is not set
 CONFIG_SYNC_FILE=y
@@ -6363,7 +6354,7 @@ CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_OF_SIMPLE=m
 CONFIG_USB_DWC3_PCI=m
-# CONFIG_USB_DWC3_QCOM is not set
+CONFIG_USB_DWC3_QCOM=m
 CONFIG_USB_DWC3_ULPI=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_EG20T is not set