arm updates for 5.3 part 2

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>

39 files changed, 69 insertions, 152 deletions

diff --git a/configs/fedora/generic/CONFIG_DW_EDMA b/configs/fedora/generic/CONFIG_DW_EDMA
index dc2c1589a..1c37d89c6 100644
--- a/configs/fedora/generic/CONFIG_DW_EDMA
+++ b/configs/fedora/generic/CONFIG_DW_EDMA
@@ -1 +1 @@
-# CONFIG_DW_EDMA is not set
+CONFIG_DW_EDMA=m
diff --git a/configs/fedora/generic/CONFIG_DW_EDMA_PCIE b/configs/fedora/generic/CONFIG_DW_EDMA_PCIE
index e6b75836c..32540cae5 100644
--- a/configs/fedora/generic/CONFIG_DW_EDMA_PCIE
+++ b/configs/fedora/generic/CONFIG_DW_EDMA_PCIE
@@ -1 +1 @@
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA_PCIE=m
diff --git a/configs/fedora/generic/CONFIG_NVMEM_IMX_OCOTP_SCU b/configs/fedora/generic/CONFIG_NVMEM_IMX_OCOTP_SCU
deleted file mode 100644
index 2ac3f31c1..000000000
--- a/configs/fedora/generic/CONFIG_NVMEM_IMX_OCOTP_SCU
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
diff --git a/configs/fedora/generic/CONFIG_OLPC_XO175 b/configs/fedora/generic/CONFIG_OLPC_XO175
deleted file mode 100644
index 94d5230c2..000000000
--- a/configs/fedora/generic/CONFIG_OLPC_XO175
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_OLPC_XO175 is not set
diff --git a/configs/fedora/generic/CONFIG_PINCTRL_IMX8MN b/configs/fedora/generic/CONFIG_PINCTRL_IMX8MN
deleted file mode 100644
index ac17b7d49..000000000
--- a/configs/fedora/generic/CONFIG_PINCTRL_IMX8MN
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PINCTRL_IMX8MN is not set
diff --git a/configs/fedora/generic/CONFIG_VIDEO_MESON_VDEC b/configs/fedora/generic/CONFIG_VIDEO_MESON_VDEC
deleted file mode 100644
index 47540a932..000000000
--- a/configs/fedora/generic/CONFIG_VIDEO_MESON_VDEC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_VIDEO_MESON_VDEC is not set
diff --git a/configs/fedora/generic/arm/CONFIG_FB_MXS b/configs/fedora/generic/arm/CONFIG_FB_MXS
deleted file mode 100644
index d179e9f9d..000000000
--- a/configs/fedora/generic/arm/CONFIG_FB_MXS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FB_MXS=m
diff --git a/configs/fedora/generic/arm/CONFIG_FSL_IMX8_DDR_PMU b/configs/fedora/generic/arm/CONFIG_FSL_IMX8_DDR_PMU
index eab75a9d9..28424cc2f 100644
--- a/configs/fedora/generic/arm/CONFIG_FSL_IMX8_DDR_PMU
+++ b/configs/fedora/generic/arm/CONFIG_FSL_IMX8_DDR_PMU
@@ -1 +1 @@
-CONFIG_FSL_IMX8_DDR_PMU=m
+# CONFIG_FSL_IMX8_DDR_PMU is not set
diff --git a/configs/fedora/generic/arm/CONFIG_IMX_SCU b/configs/fedora/generic/arm/CONFIG_IMX_SCU
index f044bdbb0..dfaecae95 100644
--- a/configs/fedora/generic/arm/CONFIG_IMX_SCU
+++ b/configs/fedora/generic/arm/CONFIG_IMX_SCU
@@ -1 +1 @@
-CONFIG_IMX_SCU=y
+# CONFIG_IMX_SCU is not set
diff --git a/configs/fedora/generic/arm/CONFIG_IMX_SCU_PD b/configs/fedora/generic/arm/CONFIG_IMX_SCU_PD
deleted file mode 100644
index 3a55f90f4..000000000
--- a/configs/fedora/generic/arm/CONFIG_IMX_SCU_PD
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_IMX_SCU_PD is not set
diff --git a/configs/fedora/generic/CONFIG_PHY_QCOM_PCIE2 b/configs/fedora/generic/arm/CONFIG_PHY_QCOM_PCIE2
index 69c59e99a..69c59e99a 100644
--- a/configs/fedora/generic/CONFIG_PHY_QCOM_PCIE2
+++ b/configs/fedora/generic/arm/CONFIG_PHY_QCOM_PCIE2
diff --git a/configs/fedora/generic/arm/CONFIG_SPI_SYNQUACER b/configs/fedora/generic/arm/CONFIG_SPI_SYNQUACER
deleted file mode 100644
index f409b4c8c..000000000
--- a/configs/fedora/generic/arm/CONFIG_SPI_SYNQUACER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SPI_SYNQUACER is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_IMX8_DDR_PMU b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_IMX8_DDR_PMU
new file mode 100644
index 000000000..eab75a9d9
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_IMX8_DDR_PMU
@@ -0,0 +1 @@
+CONFIG_FSL_IMX8_DDR_PMU=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU
new file mode 100644
index 000000000..f044bdbb0
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_IMX_SCU
@@ -0,0 +1 @@
+CONFIG_IMX_SCU=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_NVMEM_IMX_OCOTP_SCU b/configs/fedora/generic/arm/aarch64/CONFIG_NVMEM_IMX_OCOTP_SCU
new file mode 100644
index 000000000..4676f0206
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_NVMEM_IMX_OCOTP_SCU
@@ -0,0 +1 @@
+CONFIG_NVMEM_IMX_OCOTP_SCU=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_MIXEL_MIPI_DPHY b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_MIXEL_MIPI_DPHY
new file mode 100644
index 000000000..706ee4637
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_MIXEL_MIPI_DPHY
@@ -0,0 +1 @@
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_QCOM_PCIE2 b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_QCOM_PCIE2
new file mode 100644
index 000000000..7d8c19c9c
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_PHY_QCOM_PCIE2
@@ -0,0 +1 @@
+CONFIG_PHY_QCOM_PCIE2=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MN b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MN
new file mode 100644
index 000000000..0e9d578b9
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_IMX8MN
@@ -0,0 +1 @@
+CONFIG_PINCTRL_IMX8MN=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SPI_SYNQUACER b/configs/fedora/generic/arm/aarch64/CONFIG_SPI_SYNQUACER
new file mode 100644
index 000000000..91a4b716d
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_SPI_SYNQUACER
@@ -0,0 +1 @@
+CONFIG_SPI_SYNQUACER=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_BATTERY_OLPC b/configs/fedora/generic/arm/armv7/armv7/CONFIG_BATTERY_OLPC
new file mode 100644
index 000000000..6a3fd40eb
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_BATTERY_OLPC
@@ -0,0 +1 @@
+CONFIG_BATTERY_OLPC=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_OLPC_EC b/configs/fedora/generic/arm/armv7/armv7/CONFIG_OLPC_EC
new file mode 100644
index 000000000..7522c8a11
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_OLPC_EC
@@ -0,0 +1 @@
+CONFIG_OLPC_EC=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_OLPC_XO175 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_OLPC_XO175
new file mode 100644
index 000000000..5e1964331
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_OLPC_XO175
@@ -0,0 +1 @@
+CONFIG_OLPC_XO175=y
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_MMP_CAMERA b/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_MMP_CAMERA
index 29d87e4f3..d0a4784ff 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_MMP_CAMERA
+++ b/configs/fedora/generic/arm/armv7/armv7/CONFIG_VIDEO_MMP_CAMERA
@@ -1 +1 @@
-# CONFIG_VIDEO_MMP_CAMERA is not set
+CONFIG_VIDEO_MMP_CAMERA=m
diff --git a/configs/fedora/generic/CONFIG_NTB_IDT b/configs/fedora/generic/x86/x86_64/CONFIG_NTB_IDT
index 0e9236c2a..0e9236c2a 100644
--- a/configs/fedora/generic/CONFIG_NTB_IDT
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_NTB_IDT
diff --git a/configs/fedora/generic/CONFIG_NTB_SWITCHTEC b/configs/fedora/generic/x86/x86_64/CONFIG_NTB_SWITCHTEC
index 36258733e..36258733e 100644
--- a/configs/fedora/generic/CONFIG_NTB_SWITCHTEC
+++ b/configs/fedora/generic/x86/x86_64/CONFIG_NTB_SWITCHTEC
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index ec3401f57..dc3a17698 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1661,8 +1661,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
@@ -1809,7 +1809,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_METRONOME is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_MX3 is not set
-CONFIG_FB_MXS=m
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_OPENCORES is not set
@@ -4256,10 +4255,8 @@ CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=256
 CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4268,7 +4265,7 @@ CONFIG_NUMA=y
 CONFIG_NVME_FC=m
 # CONFIG_NVMEM_IMX_IIM is not set
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+CONFIG_NVMEM_IMX_OCOTP_SCU=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_STM32_ROMEM=m
@@ -4311,7 +4308,6 @@ CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
-# CONFIG_OLPC_XO175 is not set
 # CONFIG_OMAP_GPMC_DEBUG is not set
 # CONFIG_OMFS_FS is not set
 CONFIG_OPENVSWITCH_GENEVE=m
@@ -4509,7 +4505,7 @@ CONFIG_PHY_MESON_G12A_USB2=y
 CONFIG_PHY_MESON_G12A_USB3_PCIE=m
 CONFIG_PHY_MESON_GXL_USB2=m
 CONFIG_PHY_MESON_GXL_USB3=m
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
 CONFIG_PHY_MVEBU_A3700_COMPHY=m
 CONFIG_PHY_MVEBU_A3700_UTMI=m
 CONFIG_PHY_MVEBU_A38X_COMPHY=m
@@ -4520,7 +4516,7 @@ CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
+CONFIG_PHY_QCOM_PCIE2=m
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
 CONFIG_PHY_QCOM_UFS_14NM=m
@@ -4557,7 +4553,7 @@ CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 # CONFIG_PINCTRL_GEMINILAKE is not set
 CONFIG_PINCTRL_IMX8MM=y
-# CONFIG_PINCTRL_IMX8MN is not set
+CONFIG_PINCTRL_IMX8MN=y
 CONFIG_PINCTRL_IMX8MQ=y
 CONFIG_PINCTRL_IMX8QM=y
 CONFIG_PINCTRL_IMX8QXP=y
@@ -6147,7 +6143,7 @@ CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_SUN4I is not set
 CONFIG_SPI_SUN6I=m
-# CONFIG_SPI_SYNQUACER is not set
+CONFIG_SPI_SYNQUACER=m
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 85cd5bd24..c4d5e5092 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1653,8 +1653,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
@@ -1793,7 +1793,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_METRONOME is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_MX3 is not set
-CONFIG_FB_MXS=m
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_OPENCORES is not set
@@ -4236,10 +4235,8 @@ CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=256
 CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
@@ -4248,7 +4245,7 @@ CONFIG_NUMA=y
 CONFIG_NVME_FC=m
 # CONFIG_NVMEM_IMX_IIM is not set
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
+CONFIG_NVMEM_IMX_OCOTP_SCU=m
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_STM32_ROMEM=m
@@ -4291,7 +4288,6 @@ CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
-# CONFIG_OLPC_XO175 is not set
 # CONFIG_OMAP_GPMC_DEBUG is not set
 # CONFIG_OMFS_FS is not set
 CONFIG_OPENVSWITCH_GENEVE=m
@@ -4489,7 +4485,7 @@ CONFIG_PHY_MESON_G12A_USB2=y
 CONFIG_PHY_MESON_G12A_USB3_PCIE=m
 CONFIG_PHY_MESON_GXL_USB2=m
 CONFIG_PHY_MESON_GXL_USB3=m
-# CONFIG_PHY_MIXEL_MIPI_DPHY is not set
+CONFIG_PHY_MIXEL_MIPI_DPHY=m
 CONFIG_PHY_MVEBU_A3700_COMPHY=m
 CONFIG_PHY_MVEBU_A3700_UTMI=m
 CONFIG_PHY_MVEBU_A38X_COMPHY=m
@@ -4500,7 +4496,7 @@ CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_PXA_28NM_USB2 is not set
 # CONFIG_PHY_QCOM_APQ8064_SATA is not set
 # CONFIG_PHY_QCOM_IPQ806X_SATA is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
+CONFIG_PHY_QCOM_PCIE2=m
 CONFIG_PHY_QCOM_QMP=m
 CONFIG_PHY_QCOM_QUSB2=m
 CONFIG_PHY_QCOM_UFS_14NM=m
@@ -4537,7 +4533,7 @@ CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 # CONFIG_PINCTRL_GEMINILAKE is not set
 CONFIG_PINCTRL_IMX8MM=y
-# CONFIG_PINCTRL_IMX8MN is not set
+CONFIG_PINCTRL_IMX8MN=y
 CONFIG_PINCTRL_IMX8MQ=y
 CONFIG_PINCTRL_IMX8QM=y
 CONFIG_PINCTRL_IMX8QXP=y
@@ -6125,7 +6121,7 @@ CONFIG_SPI_ROCKCHIP=m
 CONFIG_SPI_SPIDEV=m
 # CONFIG_SPI_SUN4I is not set
 CONFIG_SPI_SUN6I=m
-# CONFIG_SPI_SYNQUACER is not set
+CONFIG_SPI_SYNQUACER=m
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 40e83216a..c79952f90 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -551,6 +551,7 @@ CONFIG_BATTERY_DA9052=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
+CONFIG_BATTERY_OLPC=m
 CONFIG_BATTERY_RX51=m
 CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_TWL4030_MADC=m
@@ -1698,8 +1699,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
@@ -1853,7 +1854,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_METRONOME is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_MX3 is not set
-CONFIG_FB_MXS=m
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_OPENCORES is not set
@@ -1945,7 +1945,7 @@ CONFIG_FSI_SCOM=m
 # CONFIG_FSL_ENETC is not set
 # CONFIG_FSL_ENETC_PTP_CLOCK is not set
 # CONFIG_FSL_ENETC_VF is not set
-CONFIG_FSL_IMX8_DDR_PMU=m
+# CONFIG_FSL_IMX8_DDR_PMU is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
@@ -2509,9 +2509,8 @@ CONFIG_IMX_IPUV3_CORE=m
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_MBOX=m
 CONFIG_IMX_REMOTEPROC=m
-# CONFIG_IMX_SCU_PD is not set
+# CONFIG_IMX_SCU is not set
 # CONFIG_IMX_SCU_SOC is not set
-CONFIG_IMX_SCU=y
 CONFIG_IMX_SC_WDT=m
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_THERMAL=m
@@ -4346,10 +4345,8 @@ CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NVEC_PAZ00=y
@@ -4357,7 +4354,6 @@ CONFIG_NVEC_POWER=y
 CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_SNVS_LPGPR=m
 CONFIG_NVMEM_STM32_ROMEM=m
@@ -4399,7 +4395,8 @@ CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
-# CONFIG_OLPC_XO175 is not set
+CONFIG_OLPC_EC=y
+CONFIG_OLPC_XO175=y
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
 # CONFIG_OMAP2_DSS_DEBUG is not set
 CONFIG_OMAP2_DSS_DPI=y
@@ -4678,7 +4675,6 @@ CONFIG_PINCTRL_CEDARFORK=m
 CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
 CONFIG_PINCTRL_IMX6SL=y
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
@@ -6381,7 +6377,6 @@ CONFIG_SPI_STM32_QSPI=m
 CONFIG_SPI_ST_SSC4=m
 CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
-# CONFIG_SPI_SYNQUACER is not set
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
@@ -7402,7 +7397,7 @@ CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MESON_G12A_AO_CEC=m
 CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MEYE=m
-# CONFIG_VIDEO_MMP_CAMERA is not set
+CONFIG_VIDEO_MMP_CAMERA=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 582e69d09..e37885b86 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1635,8 +1635,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_MESON=m
@@ -1787,7 +1787,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_METRONOME is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_MX3 is not set
-CONFIG_FB_MXS=m
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_OPENCORES is not set
@@ -1879,7 +1878,7 @@ CONFIG_FSI_SCOM=m
 # CONFIG_FSL_ENETC is not set
 # CONFIG_FSL_ENETC_PTP_CLOCK is not set
 # CONFIG_FSL_ENETC_VF is not set
-CONFIG_FSL_IMX8_DDR_PMU=m
+# CONFIG_FSL_IMX8_DDR_PMU is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
@@ -2426,9 +2425,8 @@ CONFIG_IMX_GPCV2=y
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_MBOX=m
-# CONFIG_IMX_SCU_PD is not set
+# CONFIG_IMX_SCU is not set
 # CONFIG_IMX_SCU_SOC is not set
-CONFIG_IMX_SCU=y
 CONFIG_IMX_SC_WDT=m
 CONFIG_IMX_SDMA=m
 # CONFIG_IMX_WEIM is not set
@@ -4216,16 +4214,13 @@ CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_STM32_ROMEM=m
@@ -4267,7 +4262,6 @@ CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
-# CONFIG_OLPC_XO175 is not set
 # CONFIG_OMAP3_THERMAL is not set
 CONFIG_OMAP4_DSS_HDMI_CEC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
@@ -4506,7 +4500,6 @@ CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
@@ -6068,7 +6061,6 @@ CONFIG_SPI_STM32_QSPI=m
 # CONFIG_SPI_STM32_QUADSPI is not set
 CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
-# CONFIG_SPI_SYNQUACER is not set
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 69532da0d..bb1b2306b 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1628,8 +1628,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_MESON=m
@@ -1772,7 +1772,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_METRONOME is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_MX3 is not set
-CONFIG_FB_MXS=m
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_OPENCORES is not set
@@ -1864,7 +1863,7 @@ CONFIG_FSI_SCOM=m
 # CONFIG_FSL_ENETC is not set
 # CONFIG_FSL_ENETC_PTP_CLOCK is not set
 # CONFIG_FSL_ENETC_VF is not set
-CONFIG_FSL_IMX8_DDR_PMU=m
+# CONFIG_FSL_IMX8_DDR_PMU is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
@@ -2411,9 +2410,8 @@ CONFIG_IMX_GPCV2=y
 # CONFIG_IMX_IPUV3_CORE is not set
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_MBOX=m
-# CONFIG_IMX_SCU_PD is not set
+# CONFIG_IMX_SCU is not set
 # CONFIG_IMX_SCU_SOC is not set
-CONFIG_IMX_SCU=y
 CONFIG_IMX_SC_WDT=m
 CONFIG_IMX_SDMA=m
 # CONFIG_IMX_WEIM is not set
@@ -4197,16 +4195,13 @@ CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_STM32_ROMEM=m
@@ -4248,7 +4243,6 @@ CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
-# CONFIG_OLPC_XO175 is not set
 # CONFIG_OMAP3_THERMAL is not set
 CONFIG_OMAP4_DSS_HDMI_CEC=y
 # CONFIG_OMAP_GPMC_DEBUG is not set
@@ -4487,7 +4481,6 @@ CONFIG_PINCTRL_CEDARFORK=m
 # CONFIG_PINCTRL_CHERRYVIEW is not set
 CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
@@ -6047,7 +6040,6 @@ CONFIG_SPI_STM32_QSPI=m
 # CONFIG_SPI_STM32_QUADSPI is not set
 CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
-# CONFIG_SPI_SYNQUACER is not set
 CONFIG_SPI_TEGRA114=m
 # CONFIG_SPI_TEGRA20_SFLASH is not set
 # CONFIG_SPI_TEGRA20_SLINK is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 08062f4fc..e608b7e3d 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -551,6 +551,7 @@ CONFIG_BATTERY_DA9052=m
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
+CONFIG_BATTERY_OLPC=m
 CONFIG_BATTERY_RX51=m
 CONFIG_BATTERY_SBS=m
 CONFIG_BATTERY_TWL4030_MADC=m
@@ -1691,8 +1692,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IPQ806X=m
@@ -1838,7 +1839,6 @@ CONFIG_FB_EFI=y
 # CONFIG_FB_METRONOME is not set
 CONFIG_FB_MODE_HELPERS=y
 # CONFIG_FB_MX3 is not set
-CONFIG_FB_MXS=m
 # CONFIG_FB_NEOMAGIC is not set
 # CONFIG_FB_NVIDIA is not set
 # CONFIG_FB_OPENCORES is not set
@@ -1930,7 +1930,7 @@ CONFIG_FSI_SCOM=m
 # CONFIG_FSL_ENETC is not set
 # CONFIG_FSL_ENETC_PTP_CLOCK is not set
 # CONFIG_FSL_ENETC_VF is not set
-CONFIG_FSL_IMX8_DDR_PMU=m
+# CONFIG_FSL_IMX8_DDR_PMU is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
 # CONFIG_FSL_XGMAC_MDIO is not set
@@ -2494,9 +2494,8 @@ CONFIG_IMX_IPUV3_CORE=m
 # CONFIG_IMX_IRQSTEER is not set
 CONFIG_IMX_MBOX=m
 CONFIG_IMX_REMOTEPROC=m
-# CONFIG_IMX_SCU_PD is not set
+# CONFIG_IMX_SCU is not set
 # CONFIG_IMX_SCU_SOC is not set
-CONFIG_IMX_SCU=y
 CONFIG_IMX_SC_WDT=m
 CONFIG_IMX_SDMA=m
 CONFIG_IMX_THERMAL=m
@@ -4327,10 +4326,8 @@ CONFIG_NOUVEAU_PLATFORM_DRIVER=y
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NVEC_PAZ00=y
@@ -4338,7 +4335,6 @@ CONFIG_NVEC_POWER=y
 CONFIG_NVME_FC=m
 CONFIG_NVMEM_IMX_IIM=m
 CONFIG_NVMEM_IMX_OCOTP=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 CONFIG_NVMEM_SNVS_LPGPR=m
 CONFIG_NVMEM_STM32_ROMEM=m
@@ -4380,7 +4376,8 @@ CONFIG_OF_RESERVED_MEM=y
 CONFIG_OF_RESOLVE=y
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
-# CONFIG_OLPC_XO175 is not set
+CONFIG_OLPC_EC=y
+CONFIG_OLPC_XO175=y
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
 # CONFIG_OMAP2_DSS_DEBUG is not set
 CONFIG_OMAP2_DSS_DPI=y
@@ -4659,7 +4656,6 @@ CONFIG_PINCTRL_CEDARFORK=m
 CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
 CONFIG_PINCTRL_IMX6SL=y
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ4019 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
@@ -6360,7 +6356,6 @@ CONFIG_SPI_STM32_QSPI=m
 CONFIG_SPI_ST_SSC4=m
 CONFIG_SPI_SUN4I=m
 CONFIG_SPI_SUN6I=m
-# CONFIG_SPI_SYNQUACER is not set
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_TEGRA20_SFLASH=m
 CONFIG_SPI_TEGRA20_SLINK=m
@@ -7381,7 +7376,7 @@ CONFIG_VIDEO_MESON_AO_CEC=m
 CONFIG_VIDEO_MESON_G12A_AO_CEC=m
 CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MEYE=m
-# CONFIG_VIDEO_MMP_CAMERA is not set
+CONFIG_VIDEO_MMP_CAMERA=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 0ada6eb90..faf44849b 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1413,8 +1413,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=y
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=y
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
@@ -3972,15 +3972,12 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
 CONFIG_NSC_GPIO=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 # CONFIG_NUMA is not set
 CONFIG_NVME_FC=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SYSFS=y
@@ -4009,7 +4006,6 @@ CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
 CONFIG_OLPC_XO15_SCI=y
-# CONFIG_OLPC_XO175 is not set
 CONFIG_OLPC_XO1_PM=y
 CONFIG_OLPC_XO1_RTC=y
 CONFIG_OLPC_XO1_SCI=y
@@ -4209,7 +4205,6 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 CONFIG_PHYSICAL_ALIGN=0x400000
@@ -4227,7 +4222,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_DENVERTON=m
 CONFIG_PINCTRL_GEMINILAKE=m
 CONFIG_PINCTRL_ICELAKE=m
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 CONFIG_PINCTRL_LEWISBURG=m
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -6453,7 +6447,6 @@ CONFIG_VIDEO_IPU3_CIO2=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 3680408d9..32e2c042d 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1404,8 +1404,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=y
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=y
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
@@ -3953,15 +3953,12 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=32
 CONFIG_NS83820=m
 CONFIG_NSC_GPIO=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 # CONFIG_NUMA is not set
 CONFIG_NVME_FC=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SYSFS=y
@@ -3990,7 +3987,6 @@ CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
 CONFIG_OLPC_XO15_SCI=y
-# CONFIG_OLPC_XO175 is not set
 CONFIG_OLPC_XO1_PM=y
 CONFIG_OLPC_XO1_RTC=y
 CONFIG_OLPC_XO1_SCI=y
@@ -4190,7 +4186,6 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 CONFIG_PHYSICAL_ALIGN=0x400000
@@ -4208,7 +4203,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_DENVERTON=m
 CONFIG_PINCTRL_GEMINILAKE=m
 CONFIG_PINCTRL_ICELAKE=m
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 CONFIG_PINCTRL_LEWISBURG=m
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -6432,7 +6426,6 @@ CONFIG_VIDEO_IPU3_CIO2=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 22b012764..7dbf382b9 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1307,8 +1307,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
@@ -3690,17 +3690,14 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA=y
 CONFIG_NVME_FC=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SYSFS=y
@@ -3729,7 +3726,6 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
-# CONFIG_OLPC_XO175 is not set
 # CONFIG_OMFS_FS is not set
 CONFIG_OPAL_PRD=m
 CONFIG_OPENVSWITCH_GENEVE=m
@@ -3897,7 +3893,6 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_TUSB1210 is not set
@@ -3906,7 +3901,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -6057,7 +6051,6 @@ CONFIG_VIDEO_HEXIUM_ORION=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 9ba1ae655..45ea83465 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1298,8 +1298,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
@@ -3669,17 +3669,14 @@ CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
 CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA=y
 CONFIG_NVME_FC=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SYSFS=y
@@ -3708,7 +3705,6 @@ CONFIG_OF_FPGA_REGION=m
 CONFIG_OF_PMEM=m
 # CONFIG_OF_UNITTEST is not set
 CONFIG_OF=y
-# CONFIG_OLPC_XO175 is not set
 # CONFIG_OMFS_FS is not set
 CONFIG_OPAL_PRD=m
 CONFIG_OPENVSWITCH_GENEVE=m
@@ -3876,7 +3872,6 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_TUSB1210 is not set
@@ -3885,7 +3880,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -6034,7 +6028,6 @@ CONFIG_VIDEO_HEXIUM_ORION=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 9e9bd4883..20dbd8a7d 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1312,8 +1312,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=m
 # CONFIG_DW_DMAC is not set
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
@@ -3659,10 +3659,8 @@ CONFIG_NOUVEAU_DEBUG_MMU=y
 # CONFIG_NOZOMI is not set
 CONFIG_NR_CPUS=64
 CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
@@ -3670,7 +3668,6 @@ CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_EMU=y
 CONFIG_NUMA=y
 CONFIG_NVME_FC=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SYSFS=y
@@ -3695,7 +3692,6 @@ CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
-# CONFIG_OLPC_XO175 is not set
 # CONFIG_OMFS_FS is not set
 CONFIG_OPENVSWITCH_GENEVE=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -3863,7 +3859,6 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_TUSB1210 is not set
@@ -3872,7 +3867,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -5996,7 +5990,6 @@ CONFIG_VIDEO_HEXIUM_ORION=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index aa7093c6a..4f1d6f8e0 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1303,8 +1303,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=m
 # CONFIG_DW_DMAC is not set
 CONFIG_DW_DMAC_PCI=m
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
@@ -3638,10 +3638,8 @@ CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 # CONFIG_NOZOMI is not set
 CONFIG_NR_CPUS=64
 CONFIG_NS83820=m
-CONFIG_NTB_IDT=m
 # CONFIG_NTB is not set
 # CONFIG_NTB_MSI is not set
-CONFIG_NTB_SWITCHTEC=m
 # CONFIG_NTFS_FS is not set
 CONFIG_NULL_TTY=m
 # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set
@@ -3649,7 +3647,6 @@ CONFIG_NUMA_BALANCING=y
 CONFIG_NUMA_EMU=y
 CONFIG_NUMA=y
 CONFIG_NVME_FC=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SYSFS=y
@@ -3674,7 +3671,6 @@ CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
-# CONFIG_OLPC_XO175 is not set
 # CONFIG_OMFS_FS is not set
 CONFIG_OPENVSWITCH_GENEVE=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -3842,7 +3838,6 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 # CONFIG_PHY_TUSB1210 is not set
@@ -3851,7 +3846,6 @@ CONFIG_PID_NS=y
 # CONFIG_PINCONF is not set
 # CONFIG_PINCTRL_CANNONLAKE is not set
 CONFIG_PINCTRL_CEDARFORK=m
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 # CONFIG_PINCTRL is not set
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -5973,7 +5967,6 @@ CONFIG_VIDEO_HEXIUM_ORION=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index c660b1984..8ee0aa2ff 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1457,8 +1457,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=y
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=y
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
@@ -4037,7 +4037,6 @@ CONFIG_NUMA=y
 CONFIG_NVDIMM_DAX=y
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVME_FC=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SYSFS=y
@@ -4063,7 +4062,6 @@ CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
-# CONFIG_OLPC_XO175 is not set
 # CONFIG_OMFS_FS is not set
 CONFIG_OPENVSWITCH_GENEVE=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -4254,7 +4252,6 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 CONFIG_PHYSICAL_ALIGN=0x1000000
@@ -4272,7 +4269,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_DENVERTON=m
 CONFIG_PINCTRL_GEMINILAKE=m
 CONFIG_PINCTRL_ICELAKE=m
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 CONFIG_PINCTRL_LEWISBURG=m
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -6512,7 +6508,6 @@ CONFIG_VIDEO_IPU3_CIO2=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 629fac151..b2b22f988 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1448,8 +1448,8 @@ CONFIG_DVB_USB_ZD1301=m
 CONFIG_DW_DMAC_CORE=y
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=y
-# CONFIG_DW_EDMA is not set
-# CONFIG_DW_EDMA_PCIE is not set
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DYNAMIC_FTRACE=y
@@ -4018,7 +4018,6 @@ CONFIG_NUMA=y
 CONFIG_NVDIMM_DAX=y
 CONFIG_NVDIMM_PFN=y
 CONFIG_NVME_FC=m
-# CONFIG_NVMEM_IMX_OCOTP_SCU is not set
 # CONFIG_NVMEM_REBOOT_MODE is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_NVMEM_SYSFS=y
@@ -4044,7 +4043,6 @@ CONFIG_OCFS2_FS_O2CB=m
 CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
 CONFIG_OF_FPGA_REGION=m
 # CONFIG_OF is not set
-# CONFIG_OLPC_XO175 is not set
 # CONFIG_OMFS_FS is not set
 CONFIG_OPENVSWITCH_GENEVE=m
 CONFIG_OPENVSWITCH_GRE=m
@@ -4235,7 +4233,6 @@ CONFIG_PHYLINK=m
 # CONFIG_PHY_OCELOT_SERDES is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
-# CONFIG_PHY_QCOM_PCIE2 is not set
 # CONFIG_PHY_QCOM_USB_HSIC is not set
 # CONFIG_PHY_QCOM_USB_HS is not set
 CONFIG_PHYSICAL_ALIGN=0x1000000
@@ -4253,7 +4250,6 @@ CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_DENVERTON=m
 CONFIG_PINCTRL_GEMINILAKE=m
 CONFIG_PINCTRL_ICELAKE=m
-# CONFIG_PINCTRL_IMX8MN is not set
 # CONFIG_PINCTRL_IPQ8074 is not set
 CONFIG_PINCTRL_LEWISBURG=m
 # CONFIG_PINCTRL_MCP23S08 is not set
@@ -6491,7 +6487,6 @@ CONFIG_VIDEO_IPU3_CIO2=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
-# CONFIG_VIDEO_MESON_VDEC is not set
 CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_MXB=m
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set