initial ARM config updates for 4.19

32 files changed, 61 insertions, 136 deletions

diff --git a/configs/fedora/generic/CONFIG_BT_MTKUART b/configs/fedora/generic/CONFIG_BT_MTKUART
index dc6a89cce..057340234 100644
--- a/configs/fedora/generic/CONFIG_BT_MTKUART
+++ b/configs/fedora/generic/CONFIG_BT_MTKUART
@@ -1 +1 @@
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
diff --git a/configs/fedora/generic/CONFIG_CRYPTO_DEV_QCOM_RNG b/configs/fedora/generic/CONFIG_CRYPTO_DEV_QCOM_RNG
deleted file mode 100644
index cde300803..000000000
--- a/configs/fedora/generic/CONFIG_CRYPTO_DEV_QCOM_RNG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
diff --git a/configs/fedora/generic/CONFIG_IMX_MBOX b/configs/fedora/generic/CONFIG_IMX_MBOX
deleted file mode 100644
index 97c532fbe..000000000
--- a/configs/fedora/generic/CONFIG_IMX_MBOX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IMX_MBOX is not set
diff --git a/configs/fedora/generic/CONFIG_SND_SOC_SIMPLE_AMPLIFIER b/configs/fedora/generic/CONFIG_SND_SOC_SIMPLE_AMPLIFIER
index e0fc1741f..0ce01d661 100644
--- a/configs/fedora/generic/CONFIG_SND_SOC_SIMPLE_AMPLIFIER
+++ b/configs/fedora/generic/CONFIG_SND_SOC_SIMPLE_AMPLIFIER
@@ -1 +1 @@
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
diff --git a/configs/fedora/generic/CONFIG_TINYDRM_ILI9341 b/configs/fedora/generic/CONFIG_TINYDRM_ILI9341
deleted file mode 100644
index d0fdddaeb..000000000
--- a/configs/fedora/generic/CONFIG_TINYDRM_ILI9341
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_TINYDRM_ILI9341 is not set
diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_QCOM_RNG b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_QCOM_RNG
new file mode 100644
index 000000000..5c17767a1
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_QCOM_RNG
@@ -0,0 +1 @@
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
diff --git a/configs/fedora/generic/arm/CONFIG_TINYDRM_ILI9341 b/configs/fedora/generic/arm/CONFIG_TINYDRM_ILI9341
new file mode 100644
index 000000000..0faf7e319
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_TINYDRM_ILI9341
@@ -0,0 +1 @@
+CONFIG_TINYDRM_ILI9341=m
diff --git a/configs/fedora/generic/arm/CONFIG_USB_DWC3_HAPS b/configs/fedora/generic/arm/CONFIG_USB_DWC3_HAPS
new file mode 100644
index 000000000..795dd513a
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_USB_DWC3_HAPS
@@ -0,0 +1 @@
+CONFIG_USB_DWC3_HAPS=m
diff --git a/configs/fedora/generic/CONFIG_ARCH_K3 b/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_K3
index 6929420f8..6929420f8 100644
--- a/configs/fedora/generic/CONFIG_ARCH_K3
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_K3
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_HW_RANDOM_MSM b/configs/fedora/generic/arm/aarch64/CONFIG_HW_RANDOM_MSM
deleted file mode 100644
index b95d5cb24..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_HW_RANDOM_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_MSM=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_ARM_EXYNOS5440_CPUFREQ b/configs/fedora/generic/arm/armv7/CONFIG_ARM_EXYNOS5440_CPUFREQ
deleted file mode 100644
index 67452f022..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_ARM_EXYNOS5440_CPUFREQ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARM_EXYNOS5440_CPUFREQ=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_IMX_MBOX b/configs/fedora/generic/arm/armv7/CONFIG_IMX_MBOX
new file mode 100644
index 000000000..5a3a90d98
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_IMX_MBOX
@@ -0,0 +1 @@
+CONFIG_IMX_MBOX=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_HW_RANDOM_MSM b/configs/fedora/generic/arm/armv7/armv7/CONFIG_HW_RANDOM_MSM
deleted file mode 100644
index b95d5cb24..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_HW_RANDOM_MSM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_HW_RANDOM_MSM=m
diff --git a/configs/fedora/generic/CONFIG_PINCTRL_ICELAKE b/configs/fedora/generic/x86/CONFIG_PINCTRL_ICELAKE
index f208784ed..f208784ed 100644
--- a/configs/fedora/generic/CONFIG_PINCTRL_ICELAKE
+++ b/configs/fedora/generic/x86/CONFIG_PINCTRL_ICELAKE
diff --git a/configs/fedora/generic/CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH b/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
index b95f42ffc..b95f42ffc 100644
--- a/configs/fedora/generic/CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
+++ b/configs/fedora/generic/x86/CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index ce7cdcde8..f0702ab0e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -751,7 +751,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
@@ -1132,7 +1132,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_QCE=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
@@ -2208,7 +2208,6 @@ CONFIG_HW_RANDOM_CAVIUM=m
 CONFIG_HW_RANDOM_HISI=m
 CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_MESON=m
-CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=y
@@ -2405,7 +2404,6 @@ CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_IPUV3_CORE is not set
-# CONFIG_IMX_MBOX is not set
 CONFIG_INA2XX_ADC=m
 CONFIG_INDIRECT_PIO=y
 CONFIG_INET6_AH=m
@@ -4464,7 +4462,6 @@ CONFIG_PINCTRL_AXP209=m
 CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
@@ -5758,7 +5755,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98373=m
@@ -5799,7 +5795,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 CONFIG_SND_SOC_SGTL5000=m
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -6223,7 +6219,7 @@ CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
 CONFIG_TINYDRM_ILI9225=m
-# CONFIG_TINYDRM_ILI9341 is not set
+CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
 # CONFIG_TINYDRM_REPAPER is not set
@@ -6476,7 +6472,7 @@ CONFIG_USB_DWC2_PCI=m
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
 CONFIG_USB_DWC3_DUAL_ROLE=y
 # CONFIG_USB_DWC3_GADGET is not set
-# CONFIG_USB_DWC3_HAPS is not set
+CONFIG_USB_DWC3_HAPS=m
 # CONFIG_USB_DWC3_HOST is not set
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_OF_SIMPLE=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 993d73320..fc24f94bb 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -751,7 +751,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
@@ -1131,7 +1131,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
 CONFIG_CRYPTO_DEV_QCE=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
@@ -2190,7 +2190,6 @@ CONFIG_HW_RANDOM_CAVIUM=m
 CONFIG_HW_RANDOM_HISI=m
 CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_MESON=m
-CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=y
@@ -2387,7 +2386,6 @@ CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_IPUV3_CORE is not set
-# CONFIG_IMX_MBOX is not set
 CONFIG_INA2XX_ADC=m
 CONFIG_INDIRECT_PIO=y
 CONFIG_INET6_AH=m
@@ -4442,7 +4440,6 @@ CONFIG_PINCTRL_AXP209=m
 CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
@@ -5734,7 +5731,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98373=m
@@ -5775,7 +5771,7 @@ CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 CONFIG_SND_SOC_SGTL5000=m
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -6199,7 +6195,7 @@ CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
 CONFIG_TINYDRM_ILI9225=m
-# CONFIG_TINYDRM_ILI9341 is not set
+CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
 # CONFIG_TINYDRM_REPAPER is not set
@@ -6452,7 +6448,7 @@ CONFIG_USB_DWC2_PCI=m
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
 CONFIG_USB_DWC3_DUAL_ROLE=y
 # CONFIG_USB_DWC3_GADGET is not set
-# CONFIG_USB_DWC3_HAPS is not set
+CONFIG_USB_DWC3_HAPS=m
 # CONFIG_USB_DWC3_HOST is not set
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_OF_SIMPLE=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 56c225ba3..2eec6d6b3 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -229,7 +229,6 @@ CONFIG_ARCH_HIGHBANK=y
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KEYSTONE is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
@@ -337,7 +336,6 @@ CONFIG_ARM_ERRATA_821420=y
 CONFIG_ARM_ERRATA_825619=y
 CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
-CONFIG_ARM_EXYNOS5440_CPUFREQ=m
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_ARM_GIC_V2M=y
@@ -785,7 +783,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
@@ -1175,7 +1173,7 @@ CONFIG_CRYPTO_DEV_OMAP=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 # CONFIG_CRYPTO_DEV_PICOXCELL is not set
 CONFIG_CRYPTO_DEV_QCE=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SAHARA=m
@@ -2322,7 +2320,6 @@ CONFIG_HW_RANDOM_BCM2835=m
 CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_MESON=m
-CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_HW_RANDOM_OMAP3_ROM=m
 CONFIG_HW_RANDOM_OMAP=m
@@ -2527,7 +2524,7 @@ CONFIG_IMX7_PM_DOMAINS=y
 CONFIG_IMX_DMA=m
 CONFIG_IMX_GPCV2=y
 CONFIG_IMX_IPUV3_CORE=m
-# CONFIG_IMX_MBOX is not set
+CONFIG_IMX_MBOX=m
 CONFIG_IMX_REMOTEPROC=m
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_THERMAL=m
@@ -4727,7 +4724,6 @@ CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_ICELAKE=m
 CONFIG_PINCTRL_IMX6SL=y
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
@@ -6134,7 +6130,6 @@ CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_IMX_SSI=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC=m
@@ -6181,7 +6176,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 # CONFIG_SND_SOC_SDM845 is not set
 CONFIG_SND_SOC_SGTL5000=m
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
@@ -6665,7 +6660,7 @@ CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
 CONFIG_TINYDRM_ILI9225=m
-# CONFIG_TINYDRM_ILI9341 is not set
+CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
 # CONFIG_TINYDRM_REPAPER is not set
@@ -6932,7 +6927,7 @@ CONFIG_USB_DWC2_PCI=m
 CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3_EXYNOS=m
 # CONFIG_USB_DWC3_GADGET is not set
-# CONFIG_USB_DWC3_HAPS is not set
+CONFIG_USB_DWC3_HAPS=m
 # CONFIG_USB_DWC3_HOST is not set
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_OF_SIMPLE=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 5effc0140..67db7f521 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -224,7 +224,6 @@ CONFIG_ARCH_HIGHBANK=y
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 CONFIG_ARCH_KEYSTONE=y
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
@@ -327,7 +326,6 @@ CONFIG_ARM_ERRATA_821420=y
 CONFIG_ARM_ERRATA_825619=y
 CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
-CONFIG_ARM_EXYNOS5440_CPUFREQ=m
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_ARM_GIC_V2M=y
@@ -760,7 +758,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -1122,7 +1120,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
@@ -2406,7 +2404,7 @@ CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_IPUV3_CORE is not set
-# CONFIG_IMX_MBOX is not set
+CONFIG_IMX_MBOX=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -4495,7 +4493,6 @@ CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
@@ -5779,7 +5776,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98090=m
@@ -5822,7 +5818,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 # CONFIG_SND_SOC_SDM845 is not set
 CONFIG_SND_SOC_SGTL5000=m
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
@@ -6257,7 +6253,7 @@ CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
 CONFIG_TI_MESSAGE_MANAGER=m
 CONFIG_TINYDRM_ILI9225=m
-# CONFIG_TINYDRM_ILI9341 is not set
+CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
 # CONFIG_TINYDRM_REPAPER is not set
@@ -6515,7 +6511,7 @@ CONFIG_USB_DWC2_PCI=m
 CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3_EXYNOS=m
 # CONFIG_USB_DWC3_GADGET is not set
-# CONFIG_USB_DWC3_HAPS is not set
+CONFIG_USB_DWC3_HAPS=m
 # CONFIG_USB_DWC3_HOST is not set
 CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_USB_DWC3=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 1dc8d001c..76b7ffd51 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -224,7 +224,6 @@ CONFIG_ARCH_HIGHBANK=y
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 CONFIG_ARCH_KEYSTONE=y
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
@@ -326,7 +325,6 @@ CONFIG_ARM_ERRATA_821420=y
 CONFIG_ARM_ERRATA_825619=y
 CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
-CONFIG_ARM_EXYNOS5440_CPUFREQ=m
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_ARM_GIC_V2M=y
@@ -759,7 +757,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -1120,7 +1118,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
 CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
@@ -2388,7 +2386,7 @@ CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
 # CONFIG_IMX_IPUV3_CORE is not set
-# CONFIG_IMX_MBOX is not set
+CONFIG_IMX_MBOX=m
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -4473,7 +4471,6 @@ CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
@@ -5755,7 +5752,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98090=m
@@ -5798,7 +5794,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 # CONFIG_SND_SOC_SDM845 is not set
 CONFIG_SND_SOC_SGTL5000=m
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
@@ -6233,7 +6229,7 @@ CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
 CONFIG_TI_MESSAGE_MANAGER=m
 CONFIG_TINYDRM_ILI9225=m
-# CONFIG_TINYDRM_ILI9341 is not set
+CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
 # CONFIG_TINYDRM_REPAPER is not set
@@ -6491,7 +6487,7 @@ CONFIG_USB_DWC2_PCI=m
 CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3_EXYNOS=m
 # CONFIG_USB_DWC3_GADGET is not set
-# CONFIG_USB_DWC3_HAPS is not set
+CONFIG_USB_DWC3_HAPS=m
 # CONFIG_USB_DWC3_HOST is not set
 CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_USB_DWC3=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 4bc011f67..73b9a11c9 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -229,7 +229,6 @@ CONFIG_ARCH_HIGHBANK=y
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KEYSTONE is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
@@ -336,7 +335,6 @@ CONFIG_ARM_ERRATA_821420=y
 CONFIG_ARM_ERRATA_825619=y
 CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
-CONFIG_ARM_EXYNOS5440_CPUFREQ=m
 CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_ARM_GIC_V2M=y
@@ -784,7 +782,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_QCOMSMD=m
 CONFIG_BT_RFCOMM=m
@@ -1173,7 +1171,7 @@ CONFIG_CRYPTO_DEV_OMAP=m
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 # CONFIG_CRYPTO_DEV_PICOXCELL is not set
 CONFIG_CRYPTO_DEV_QCE=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
+CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_S5P=m
 CONFIG_CRYPTO_DEV_SAHARA=m
@@ -2304,7 +2302,6 @@ CONFIG_HW_RANDOM_BCM2835=m
 CONFIG_HW_RANDOM_EXYNOS=m
 CONFIG_HW_RANDOM_IMX_RNGC=m
 CONFIG_HW_RANDOM_MESON=m
-CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_HW_RANDOM_OMAP3_ROM=m
 CONFIG_HW_RANDOM_OMAP=m
@@ -2509,7 +2506,7 @@ CONFIG_IMX7_PM_DOMAINS=y
 CONFIG_IMX_DMA=m
 CONFIG_IMX_GPCV2=y
 CONFIG_IMX_IPUV3_CORE=m
-# CONFIG_IMX_MBOX is not set
+CONFIG_IMX_MBOX=m
 CONFIG_IMX_REMOTEPROC=m
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_THERMAL=m
@@ -4705,7 +4702,6 @@ CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-CONFIG_PINCTRL_ICELAKE=m
 CONFIG_PINCTRL_IMX6SL=y
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
@@ -6110,7 +6106,6 @@ CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_IMX_SSI=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC_LPASS_CPU=m
 CONFIG_SND_SOC_LPASS_PLATFORM=m
 CONFIG_SND_SOC=m
@@ -6157,7 +6152,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 # CONFIG_SND_SOC_SDM845 is not set
 CONFIG_SND_SOC_SGTL5000=m
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
@@ -6641,7 +6636,7 @@ CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
 CONFIG_TINYDRM_ILI9225=m
-# CONFIG_TINYDRM_ILI9341 is not set
+CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
 # CONFIG_TINYDRM_REPAPER is not set
@@ -6908,7 +6903,7 @@ CONFIG_USB_DWC2_PCI=m
 CONFIG_USB_DWC3_DUAL_ROLE=y
 CONFIG_USB_DWC3_EXYNOS=m
 # CONFIG_USB_DWC3_GADGET is not set
-# CONFIG_USB_DWC3_HAPS is not set
+CONFIG_USB_DWC3_HAPS=m
 # CONFIG_USB_DWC3_HOST is not set
 CONFIG_USB_DWC3=m
 CONFIG_USB_DWC3_OF_SIMPLE=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 0604e47ff..b49007d0f 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -247,7 +247,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
 CONFIG_ARCH_MULTIPLATFORM=y
@@ -637,7 +636,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -971,7 +970,6 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -2224,7 +2222,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_MBOX is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -5494,7 +5491,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5849,7 +5846,6 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_ILI9341 is not set
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 3835fb189..c6d6eebf4 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -247,7 +247,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
 CONFIG_ARCH_MULTIPLATFORM=y
@@ -640,7 +639,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -975,7 +974,6 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -2245,7 +2243,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_MBOX is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -5519,7 +5516,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5874,7 +5871,6 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_ILI9341 is not set
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 916f0d8c9..7510ce531 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -247,7 +247,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
 CONFIG_ARCH_MULTIPLATFORM=y
@@ -640,7 +639,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -975,7 +974,6 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -2245,7 +2243,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_MBOX is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -5519,7 +5516,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5874,7 +5871,6 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_ILI9341 is not set
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 986b2661c..cd866d37d 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -247,7 +247,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
 CONFIG_ARCH_MULTIPLATFORM=y
@@ -637,7 +636,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -971,7 +970,6 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -2224,7 +2222,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_MBOX is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -5494,7 +5491,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5849,7 +5846,6 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_ILI9341 is not set
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index ac988cd41..c4acf9564 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -191,7 +191,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
 CONFIG_ARCH_MULTIPLATFORM=y
@@ -580,7 +579,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -904,7 +903,6 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
 # CONFIG_CRYPTO_DEV_NX is not set
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -2076,7 +2074,6 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_MBOX is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -3993,7 +3990,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
-CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -5186,7 +5182,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 # CONFIG_SND_SOC is not set
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98373=m
@@ -5215,7 +5210,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5552,7 +5547,6 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_ILI9341 is not set
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 497fd5756..274d52052 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -191,7 +191,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
 CONFIG_ARCH_MULTIPLATFORM=y
@@ -577,7 +576,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -900,7 +899,6 @@ CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=m
 # CONFIG_CRYPTO_DEV_NX is not set
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
@@ -2055,7 +2053,6 @@ CONFIG_IMA_READ_POLICY=y
 CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_MBOX is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -3968,7 +3965,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
-CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -5159,7 +5155,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 # CONFIG_SND_SOC is not set
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98373=m
@@ -5188,7 +5183,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5525,7 +5520,6 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_ILI9341 is not set
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 91685ce1c..b1384a719 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -194,7 +194,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
 CONFIG_ARCH_MULTIPLATFORM=y
@@ -581,7 +580,7 @@ CONFIG_BT_LEDS=y
 CONFIG_BT_LE=y
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -901,7 +900,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -2030,7 +2028,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_MBOX is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -3928,7 +3925,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
-CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -5083,7 +5079,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98373=m
@@ -5112,7 +5107,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5445,7 +5440,6 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_ILI9341 is not set
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 31081eb2c..be6e6c954 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -194,7 +194,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
 CONFIG_ARCH_MULTIPLATFORM=y
@@ -578,7 +577,7 @@ CONFIG_BT_LEDS=y
 CONFIG_BT_LE=y
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -897,7 +896,6 @@ CONFIG_CRYPTO_DEV_HIFN_795X=m
 CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
 # CONFIG_CRYPTO_DEV_HISI_SEC is not set
 CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -2009,7 +2007,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_MBOX is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -3903,7 +3900,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
-CONFIG_PINCTRL_ICELAKE=m
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -5056,7 +5052,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
-# CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_MAX9759=m
 CONFIG_SND_SOC_MAX98373=m
@@ -5085,7 +5080,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5418,7 +5413,6 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_ILI9341 is not set
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index e6208f69a..a767bb1b8 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -249,7 +249,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MEMORY_PROBE is not set
@@ -652,7 +651,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -1001,7 +1000,6 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_SP_PSP=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
@@ -2290,7 +2288,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_MBOX is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -5567,7 +5564,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5924,7 +5921,6 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_ILI9341 is not set
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index b0da0a5ca..279475ec6 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -249,7 +249,6 @@ CONFIG_AR5523=m
 # CONFIG_ARCH_IOP32X is not set
 # CONFIG_ARCH_IOP33X is not set
 # CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_K3 is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MEMORY_PROBE is not set
@@ -649,7 +648,7 @@ CONFIG_BT_LE=y
 CONFIG_BT=m
 CONFIG_BT_MRVL=m
 CONFIG_BT_MRVL_SDIO=m
-CONFIG_BT_MTKUART=m
+# CONFIG_BT_MTKUART is not set
 CONFIG_BT_QCA=m
 CONFIG_BT_RFCOMM=m
 CONFIG_BT_RFCOMM_TTY=y
@@ -997,7 +996,6 @@ CONFIG_CRYPTO_DEV_QAT_C62X=m
 CONFIG_CRYPTO_DEV_QAT_C62XVF=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
 CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
-# CONFIG_CRYPTO_DEV_QCOM_RNG is not set
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
 CONFIG_CRYPTO_DEV_SP_PSP=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
@@ -2269,7 +2267,6 @@ CONFIG_IMA_TRUSTED_KEYRING=y
 CONFIG_IMA_WRITE_POLICY=y
 CONFIG_IMA=y
 # CONFIG_IMG_ASCII_LCD is not set
-# CONFIG_IMX_MBOX is not set
 # CONFIG_INA2XX_ADC is not set
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
@@ -5542,7 +5539,7 @@ CONFIG_SND_SOC_PCM186X_SPI=m
 # CONFIG_SND_SOC_RT5631 is not set
 # CONFIG_SND_SOC_SDM845 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
-# CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
 # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set
 CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_SSM2305 is not set
@@ -5899,7 +5896,6 @@ CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
 # CONFIG_TIMB_DMA is not set
-# CONFIG_TINYDRM_ILI9341 is not set
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
 # CONFIG_TIPC_MEDIA_IB is not set
diff --git a/kernel.spec b/kernel.spec
index 3263484b0..7a7c8697b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1865,6 +1865,7 @@ fi
 %changelog
 * Mon Sep  3 2018 Peter Robinson <pbrobinson@fedoraproject.org>
 - Enable bcm283x VCHIQ, camera and analog audio drivers
+- ARM config updates for 4.19
 
 * Mon Sep 03 2018 Jeremy Cline <jcline@redhat.com> - 4.19.0-0.rc2.git0.1
 - Linux v4.19-rc2