arm: a few more updates

36 files changed, 61 insertions, 125 deletions

diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_MDIO b/configs/fedora/generic/CONFIG_FSL_ENETC_MDIO
deleted file mode 100644
index 9ae6245d1..000000000
--- a/configs/fedora/generic/CONFIG_FSL_ENETC_MDIO
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_FSL_ENETC_MDIO is not set
diff --git a/configs/fedora/generic/CONFIG_MMC_SDHCI_MILBEAUT b/configs/fedora/generic/CONFIG_MMC_SDHCI_MILBEAUT
index 4d736746f..c67ef179b 100644
--- a/configs/fedora/generic/CONFIG_MMC_SDHCI_MILBEAUT
+++ b/configs/fedora/generic/CONFIG_MMC_SDHCI_MILBEAUT
@@ -1 +1 @@
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
diff --git a/configs/fedora/generic/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 b/configs/fedora/generic/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631
deleted file mode 100644
index b4777839c..000000000
--- a/configs/fedora/generic/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
diff --git a/configs/fedora/generic/arm/CONFIG_DRM_KOMEDA_ERROR_PRINT b/configs/fedora/generic/arm/CONFIG_DRM_KOMEDA_ERROR_PRINT
index 9fcc8db77..110425bf0 100644
--- a/configs/fedora/generic/arm/CONFIG_DRM_KOMEDA_ERROR_PRINT
+++ b/configs/fedora/generic/arm/CONFIG_DRM_KOMEDA_ERROR_PRINT
@@ -1 +1 @@
-CONFIG_DRM_KOMEDA_ERROR_PRINT=y
+# CONFIG_DRM_KOMEDA_ERROR_PRINT is not set
diff --git a/configs/fedora/generic/arm/CONFIG_EXYNOS5422_DMC b/configs/fedora/generic/arm/CONFIG_EXYNOS5422_DMC
deleted file mode 100644
index b0f5dfb6f..000000000
--- a/configs/fedora/generic/arm/CONFIG_EXYNOS5422_DMC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXYNOS5422_DMC is not set
diff --git a/configs/fedora/generic/arm/CONFIG_INTERCONNECT_QCOM_MSM8974 b/configs/fedora/generic/arm/CONFIG_INTERCONNECT_QCOM_MSM8974
index 58f12f2f9..e03a8268e 100644
--- a/configs/fedora/generic/arm/CONFIG_INTERCONNECT_QCOM_MSM8974
+++ b/configs/fedora/generic/arm/CONFIG_INTERCONNECT_QCOM_MSM8974
@@ -1 +1 @@
-CONFIG_INTERCONNECT_QCOM_MSM8974=m
+# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
diff --git a/configs/fedora/generic/arm/CONFIG_PINCTRL_MSM8976 b/configs/fedora/generic/arm/CONFIG_PINCTRL_MSM8976
index b0263431f..05e860247 100644
--- a/configs/fedora/generic/arm/CONFIG_PINCTRL_MSM8976
+++ b/configs/fedora/generic/arm/CONFIG_PINCTRL_MSM8976
@@ -1 +1 @@
-CONFIG_PINCTRL_MSM8976=m
+# CONFIG_PINCTRL_MSM8976 is not set
diff --git a/configs/fedora/generic/CONFIG_QCS_Q6SSTOP_404 b/configs/fedora/generic/arm/CONFIG_QCS_Q6SSTOP_404
index 20e3f557a..20e3f557a 100644
--- a/configs/fedora/generic/CONFIG_QCS_Q6SSTOP_404
+++ b/configs/fedora/generic/arm/CONFIG_QCS_Q6SSTOP_404
diff --git a/configs/fedora/generic/arm/CONFIG_SC_GCC_7180 b/configs/fedora/generic/arm/CONFIG_SC_GCC_7180
index 1ca9fc323..7e78cbfb2 100644
--- a/configs/fedora/generic/arm/CONFIG_SC_GCC_7180
+++ b/configs/fedora/generic/arm/CONFIG_SC_GCC_7180
@@ -1 +1 @@
-CONFIG_SC_GCC_7180=m
+# CONFIG_SC_GCC_7180 is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_MDIO b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_MDIO
new file mode 100644
index 000000000..0dfc48a4b
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_MDIO
@@ -0,0 +1 @@
+CONFIG_FSL_ENETC_MDIO=m
diff --git a/configs/fedora/generic/CONFIG_FSL_ENETC_QOS b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_QOS
index 850301b89..850301b89 100644
--- a/configs/fedora/generic/CONFIG_FSL_ENETC_QOS
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_FSL_ENETC_QOS
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MLXBF_BOOTCTL b/configs/fedora/generic/arm/aarch64/CONFIG_MLXBF_BOOTCTL
index 98bb5d66e..3bf6d6449 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MLXBF_BOOTCTL
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_MLXBF_BOOTCTL
@@ -1 +1 @@
-CONFIG_MLXBF_BOOTCTL=m
+# CONFIG_MLXBF_BOOTCTL is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_AM335X_PHY_USB b/configs/fedora/generic/arm/armv7/CONFIG_AM335X_PHY_USB
index b3f86e351..b3f86e351 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_AM335X_PHY_USB
+++ b/configs/fedora/generic/arm/armv7/CONFIG_AM335X_PHY_USB
diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_CURVE25519_NEON b/configs/fedora/generic/arm/armv7/CONFIG_CRYPTO_CURVE25519_NEON
index 177896090..177896090 100644
--- a/configs/fedora/generic/arm/CONFIG_CRYPTO_CURVE25519_NEON
+++ b/configs/fedora/generic/arm/armv7/CONFIG_CRYPTO_CURVE25519_NEON
diff --git a/configs/fedora/generic/arm/CONFIG_CRYPTO_POLY1305_ARM b/configs/fedora/generic/arm/armv7/CONFIG_CRYPTO_POLY1305_ARM
index bb326b4f9..bb326b4f9 100644
--- a/configs/fedora/generic/arm/CONFIG_CRYPTO_POLY1305_ARM
+++ b/configs/fedora/generic/arm/armv7/CONFIG_CRYPTO_POLY1305_ARM
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_EXYNOS5422_DMC b/configs/fedora/generic/arm/armv7/CONFIG_EXYNOS5422_DMC
new file mode 100644
index 000000000..7c1b0dbb9
--- /dev/null
+++ b/configs/fedora/generic/arm/armv7/CONFIG_EXYNOS5422_DMC
@@ -0,0 +1 @@
+CONFIG_EXYNOS5422_DMC=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 b/configs/fedora/generic/arm/armv7/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631
deleted file mode 100644
index cbf1d012f..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_WKUP_M3_RPROC b/configs/fedora/generic/arm/armv7/CONFIG_WKUP_M3_RPROC
index e49f0132a..e49f0132a 100644
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_WKUP_M3_RPROC
+++ b/configs/fedora/generic/arm/armv7/CONFIG_WKUP_M3_RPROC
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_AM335X_PHY_USB b/configs/fedora/generic/arm/armv7/lpae/CONFIG_AM335X_PHY_USB
deleted file mode 100644
index 26554650a..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_AM335X_PHY_USB
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_AM335X_PHY_USB is not set
diff --git a/configs/fedora/generic/arm/armv7/lpae/CONFIG_SOC_AM43XX b/configs/fedora/generic/arm/armv7/lpae/CONFIG_SOC_AM43XX
deleted file mode 100644
index 4761c4279..000000000
--- a/configs/fedora/generic/arm/armv7/lpae/CONFIG_SOC_AM43XX
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SOC_AM43XX is not set
diff --git a/configs/fedora/generic/CONFIG_SYSTEM76_ACPI b/configs/fedora/generic/x86/CONFIG_SYSTEM76_ACPI
index c22f4b5b3..c22f4b5b3 100644
--- a/configs/fedora/generic/CONFIG_SYSTEM76_ACPI
+++ b/configs/fedora/generic/x86/CONFIG_SYSTEM76_ACPI
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 8599af399..d91a844ff 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -1147,7 +1147,6 @@ CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_CURVE25519=m
-CONFIG_CRYPTO_CURVE25519_NEON=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DEV_ALLWINNER=y
@@ -1238,7 +1237,6 @@ CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_POLY1305_ARM=m
 CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_POLY1305_NEON=m
 CONFIG_CRYPTO_RMD128=m
@@ -1509,7 +1507,7 @@ CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
 CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_KOMEDA_ERROR_PRINT=y
+# CONFIG_DRM_KOMEDA_ERROR_PRINT is not set
 CONFIG_DRM_KOMEDA=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LIMA=m
@@ -1811,7 +1809,6 @@ CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_EXTCON_USB_GPIO=m
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_EXYNOS5422_DMC is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
@@ -1965,7 +1962,7 @@ CONFIG_FSL_DPAA=y
 CONFIG_FSL_EDMA=m
 CONFIG_FSL_ENETC_HW_TIMESTAMPING=y
 CONFIG_FSL_ENETC=m
-# CONFIG_FSL_ENETC_MDIO is not set
+CONFIG_FSL_ENETC_MDIO=m
 CONFIG_FSL_ENETC_PTP_CLOCK=m
 CONFIG_FSL_ENETC_QOS=y
 CONFIG_FSL_ENETC_VF=m
@@ -2652,7 +2649,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT=m
-CONFIG_INTERCONNECT_QCOM_MSM8974=m
+# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 CONFIG_INTERCONNECT_QCOM_SDM845=m
 CONFIG_INTERCONNECT_QCOM=y
@@ -3500,7 +3497,7 @@ CONFIG_MLX5_SW_STEERING=y
 # CONFIG_MLX5_TLS is not set
 CONFIG_MLX90614=m
 CONFIG_MLX90632=m
-CONFIG_MLXBF_BOOTCTL=m
+# CONFIG_MLXBF_BOOTCTL is not set
 CONFIG_MLXBF_TMFIFO=m
 CONFIG_MLXFW=m
 CONFIG_MLXREG_HOTPLUG=m
@@ -3556,7 +3553,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_SDHCI_IPROC=m
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
@@ -4628,7 +4625,7 @@ CONFIG_PINCTRL_MESON_GXL=y
 # CONFIG_PINCTRL_MSM8660 is not set
 CONFIG_PINCTRL_MSM8916=y
 # CONFIG_PINCTRL_MSM8960 is not set
-CONFIG_PINCTRL_MSM8976=m
+# CONFIG_PINCTRL_MSM8976 is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_MSM8996=y
 CONFIG_PINCTRL_MSM8998=m
@@ -5312,7 +5309,7 @@ CONFIG_SBP_TARGET=m
 # CONFIG_SC1200_WDT is not set
 CONFIG_SC92031=m
 # CONFIG_SCA3000 is not set
-CONFIG_SC_GCC_7180=m
+# CONFIG_SC_GCC_7180 is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHED_MC_PRIO is not set
@@ -5947,7 +5944,6 @@ CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_APQ8016_SBC=m
 CONFIG_SND_SOC_ARNDALE=m
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
@@ -6353,7 +6349,6 @@ CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYS_HYPERVISOR is not set
-CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 20e3e5a4e..ca7d084f1 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -1147,7 +1147,6 @@ CONFIG_CRYPTO_CRYPTD=y
 CONFIG_CRYPTO_CTR=y
 CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_CURVE25519=m
-CONFIG_CRYPTO_CURVE25519_NEON=m
 CONFIG_CRYPTO_DEFLATE=y
 CONFIG_CRYPTO_DES=m
 CONFIG_CRYPTO_DEV_ALLWINNER=y
@@ -1238,7 +1237,6 @@ CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_OFB=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_PCRYPT=m
-CONFIG_CRYPTO_POLY1305_ARM=m
 CONFIG_CRYPTO_POLY1305=m
 CONFIG_CRYPTO_POLY1305_NEON=m
 CONFIG_CRYPTO_RMD128=m
@@ -1501,7 +1499,7 @@ CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
 CONFIG_DRM_I2C_SIL164=m
-CONFIG_DRM_KOMEDA_ERROR_PRINT=y
+# CONFIG_DRM_KOMEDA_ERROR_PRINT is not set
 CONFIG_DRM_KOMEDA=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LIMA=m
@@ -1803,7 +1801,6 @@ CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_EXTCON_USB_GPIO=m
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_EXYNOS5422_DMC is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_F2FS_CHECK_FS is not set
 # CONFIG_F2FS_FAULT_INJECTION is not set
@@ -1949,7 +1946,7 @@ CONFIG_FSL_DPAA=y
 CONFIG_FSL_EDMA=m
 CONFIG_FSL_ENETC_HW_TIMESTAMPING=y
 CONFIG_FSL_ENETC=m
-# CONFIG_FSL_ENETC_MDIO is not set
+CONFIG_FSL_ENETC_MDIO=m
 CONFIG_FSL_ENETC_PTP_CLOCK=m
 CONFIG_FSL_ENETC_QOS=y
 CONFIG_FSL_ENETC_VF=m
@@ -2636,7 +2633,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 CONFIG_INTERCONNECT=m
-CONFIG_INTERCONNECT_QCOM_MSM8974=m
+# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 CONFIG_INTERCONNECT_QCOM_SDM845=m
 CONFIG_INTERCONNECT_QCOM=y
@@ -3481,7 +3478,7 @@ CONFIG_MLX5_SW_STEERING=y
 # CONFIG_MLX5_TLS is not set
 CONFIG_MLX90614=m
 CONFIG_MLX90632=m
-CONFIG_MLXBF_BOOTCTL=m
+# CONFIG_MLXBF_BOOTCTL is not set
 CONFIG_MLXBF_TMFIFO=m
 CONFIG_MLXFW=m
 CONFIG_MLXREG_HOTPLUG=m
@@ -3537,7 +3534,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=m
 CONFIG_MMC_SDHCI_F_SDH30=m
 CONFIG_MMC_SDHCI_IPROC=m
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
@@ -4608,7 +4605,7 @@ CONFIG_PINCTRL_MESON_GXL=y
 # CONFIG_PINCTRL_MSM8660 is not set
 CONFIG_PINCTRL_MSM8916=y
 # CONFIG_PINCTRL_MSM8960 is not set
-CONFIG_PINCTRL_MSM8976=m
+# CONFIG_PINCTRL_MSM8976 is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 CONFIG_PINCTRL_MSM8996=y
 CONFIG_PINCTRL_MSM8998=m
@@ -5291,7 +5288,7 @@ CONFIG_SBP_TARGET=m
 # CONFIG_SC1200_WDT is not set
 CONFIG_SC92031=m
 # CONFIG_SCA3000 is not set
-CONFIG_SC_GCC_7180=m
+# CONFIG_SC_GCC_7180 is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHED_MC_PRIO is not set
@@ -5925,7 +5922,6 @@ CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 CONFIG_SND_SOC_APQ8016_SBC=m
 CONFIG_SND_SOC_ARNDALE=m
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
@@ -6331,7 +6327,6 @@ CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_SYS_HYPERVISOR is not set
-CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 251038427..8aa104ec0 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -1521,7 +1521,7 @@ CONFIG_DRM_IMX_LDB=m
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
-CONFIG_DRM_KOMEDA_ERROR_PRINT=y
+# CONFIG_DRM_KOMEDA_ERROR_PRINT is not set
 CONFIG_DRM_KOMEDA=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LIMA=m
@@ -1837,7 +1837,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_EXTCON_USB_GPIO=m
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_EXYNOS5422_DMC is not set
+CONFIG_EXYNOS5422_DMC=m
 CONFIG_EXYNOS_ADC=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1984,8 +1984,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_IMX8_DDR_PMU is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
@@ -2674,7 +2672,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-CONFIG_INTERCONNECT_QCOM_MSM8974=m
+# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_INV_MPU6050_I2C=m
@@ -3606,7 +3604,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI_IPROC=m
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
@@ -4713,7 +4711,7 @@ CONFIG_PINCTRL_IMX6SL=y
 CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8960=m
-CONFIG_PINCTRL_MSM8976=m
+# CONFIG_PINCTRL_MSM8976 is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MSM8998=m
@@ -5435,7 +5433,7 @@ CONFIG_SBP_TARGET=m
 # CONFIG_SC1200_WDT is not set
 CONFIG_SC92031=m
 # CONFIG_SCA3000 is not set
-CONFIG_SC_GCC_7180=m
+# CONFIG_SC_GCC_7180 is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHED_MC_PRIO is not set
@@ -6093,7 +6091,6 @@ CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
-CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
@@ -6580,7 +6577,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index b3015a29c..91406f2b8 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -1514,7 +1514,7 @@ CONFIG_DRM_IMX_LDB=m
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
-CONFIG_DRM_KOMEDA_ERROR_PRINT=y
+# CONFIG_DRM_KOMEDA_ERROR_PRINT is not set
 CONFIG_DRM_KOMEDA=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LIMA=m
@@ -1830,7 +1830,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_EXTCON_USB_GPIO=m
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_EXYNOS5422_DMC is not set
+CONFIG_EXYNOS5422_DMC=m
 CONFIG_EXYNOS_ADC=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1969,8 +1969,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_IMX8_DDR_PMU is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
@@ -2659,7 +2657,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-CONFIG_INTERCONNECT_QCOM_MSM8974=m
+# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_INV_MPU6050_I2C=m
@@ -3588,7 +3586,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI_IPROC=m
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
@@ -4694,7 +4692,7 @@ CONFIG_PINCTRL_IMX6SL=y
 CONFIG_PINCTRL_MSM8660=m
 CONFIG_PINCTRL_MSM8916=m
 CONFIG_PINCTRL_MSM8960=m
-CONFIG_PINCTRL_MSM8976=m
+# CONFIG_PINCTRL_MSM8976 is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MSM8998=m
@@ -5415,7 +5413,7 @@ CONFIG_SBP_TARGET=m
 # CONFIG_SC1200_WDT is not set
 CONFIG_SC92031=m
 # CONFIG_SCA3000 is not set
-CONFIG_SC_GCC_7180=m
+# CONFIG_SC_GCC_7180 is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHED_MC_PRIO is not set
@@ -6072,7 +6070,6 @@ CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
-CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
@@ -6559,7 +6556,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 1ece33eed..eaeb4271e 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -170,7 +170,7 @@ CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
 # CONFIG_AM2315 is not set
-# CONFIG_AM335X_PHY_USB is not set
+CONFIG_AM335X_PHY_USB=m
 CONFIG_AMBA_PL08X=y
 CONFIG_AMD8111_ETH=m
 # CONFIG_AMD_IOMMU_DEBUGFS is not set
@@ -1485,7 +1485,7 @@ CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_IMX is not set
-CONFIG_DRM_KOMEDA_ERROR_PRINT=y
+# CONFIG_DRM_KOMEDA_ERROR_PRINT is not set
 CONFIG_DRM_KOMEDA=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LIMA=m
@@ -1789,7 +1789,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_EXTCON_USB_GPIO=m
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_EXYNOS5422_DMC is not set
+CONFIG_EXYNOS5422_DMC=m
 CONFIG_EXYNOS_ADC=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1936,8 +1936,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_IMX8_DDR_PMU is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
@@ -2606,7 +2604,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-CONFIG_INTERCONNECT_QCOM_MSM8974=m
+# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_INV_MPU6050_I2C=m
@@ -3521,7 +3519,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI_IPROC=m
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
@@ -4589,7 +4587,7 @@ CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_MDM9615 is not set
 # CONFIG_PINCTRL_MESON8B is not set
 # CONFIG_PINCTRL_MESON8 is not set
-CONFIG_PINCTRL_MSM8976=m
+# CONFIG_PINCTRL_MSM8976 is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MSM8998=m
@@ -5252,7 +5250,7 @@ CONFIG_SBP_TARGET=m
 # CONFIG_SC1200_WDT is not set
 CONFIG_SC92031=m
 # CONFIG_SCA3000 is not set
-CONFIG_SC_GCC_7180=m
+# CONFIG_SC_GCC_7180 is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHED_MC_PRIO is not set
@@ -5892,7 +5890,6 @@ CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
-CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
@@ -6124,7 +6121,7 @@ CONFIG_SND_VX222=m
 # CONFIG_SND_XEN_FRONTEND is not set
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_AM33XX is not set
-# CONFIG_SOC_AM43XX is not set
+CONFIG_SOC_AM43XX=y
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SOC_CAMERA is not set
 CONFIG_SOC_DRA7XX=y
@@ -6332,7 +6329,6 @@ CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
@@ -7379,6 +7375,7 @@ CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100=m
 CONFIG_WIZNET_W5100_SPI=m
 CONFIG_WIZNET_W5300=m
+CONFIG_WKUP_M3_RPROC=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL1251_SPI=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index ad6bf5553..904c02348 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -170,7 +170,7 @@ CONFIG_ALTERA_STAPL=m
 CONFIG_ALTERA_TSE=m
 CONFIG_ALX=m
 # CONFIG_AM2315 is not set
-# CONFIG_AM335X_PHY_USB is not set
+CONFIG_AM335X_PHY_USB=m
 CONFIG_AMBA_PL08X=y
 CONFIG_AMD8111_ETH=m
 # CONFIG_AMD_IOMMU_DEBUGFS is not set
@@ -1478,7 +1478,7 @@ CONFIG_DRM_I2C_CH7006=m
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
 CONFIG_DRM_I2C_SIL164=m
 # CONFIG_DRM_IMX is not set
-CONFIG_DRM_KOMEDA_ERROR_PRINT=y
+# CONFIG_DRM_KOMEDA_ERROR_PRINT is not set
 CONFIG_DRM_KOMEDA=m
 # CONFIG_DRM_LEGACY is not set
 CONFIG_DRM_LIMA=m
@@ -1782,7 +1782,7 @@ CONFIG_EXTCON_USBC_CROS_EC=m
 CONFIG_EXTCON_USB_GPIO=m
 CONFIG_EXTCON=y
 CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_EXYNOS5422_DMC is not set
+CONFIG_EXYNOS5422_DMC=m
 CONFIG_EXYNOS_ADC=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -1921,8 +1921,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_IMX8_DDR_PMU is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
@@ -2591,7 +2589,7 @@ CONFIG_INTEL_STRATIX10_SERVICE=m
 # CONFIG_INTEL_TH is not set
 CONFIG_INTEL_XWAY_PHY=m
 # CONFIG_INTERCONNECT is not set
-CONFIG_INTERCONNECT_QCOM_MSM8974=m
+# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
 # CONFIG_INTERCONNECT_QCOM_QCS404 is not set
 # CONFIG_INTERVAL_TREE_TEST is not set
 CONFIG_INV_MPU6050_I2C=m
@@ -3503,7 +3501,7 @@ CONFIG_MMC_SDHCI_ESDHC_IMX=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI_IPROC=m
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 CONFIG_MMC_SDHCI_OF_ARASAN=m
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
@@ -4570,7 +4568,7 @@ CONFIG_PINCTRL_DOVE=y
 # CONFIG_PINCTRL_MDM9615 is not set
 # CONFIG_PINCTRL_MESON8B is not set
 # CONFIG_PINCTRL_MESON8 is not set
-CONFIG_PINCTRL_MSM8976=m
+# CONFIG_PINCTRL_MSM8976 is not set
 # CONFIG_PINCTRL_MSM8994 is not set
 # CONFIG_PINCTRL_MSM8996 is not set
 CONFIG_PINCTRL_MSM8998=m
@@ -5232,7 +5230,7 @@ CONFIG_SBP_TARGET=m
 # CONFIG_SC1200_WDT is not set
 CONFIG_SC92031=m
 # CONFIG_SCA3000 is not set
-CONFIG_SC_GCC_7180=m
+# CONFIG_SC_GCC_7180 is not set
 CONFIG_SCHED_AUTOGROUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHED_MC_PRIO is not set
@@ -5871,7 +5869,6 @@ CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
 # CONFIG_SND_SOC_APQ8016_SBC is not set
 CONFIG_SND_SOC_ARNDALE=m
-CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
@@ -6103,7 +6100,7 @@ CONFIG_SND_VX222=m
 # CONFIG_SND_XEN_FRONTEND is not set
 CONFIG_SND_YMFPCI=m
 # CONFIG_SOC_AM33XX is not set
-# CONFIG_SOC_AM43XX is not set
+CONFIG_SOC_AM43XX=y
 # CONFIG_SOC_BRCMSTB is not set
 # CONFIG_SOC_CAMERA is not set
 CONFIG_SOC_DRA7XX=y
@@ -6311,7 +6308,6 @@ CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
-CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
@@ -7358,6 +7354,7 @@ CONFIG_WIZNET_BUS_ANY=y
 CONFIG_WIZNET_W5100=m
 CONFIG_WIZNET_W5100_SPI=m
 CONFIG_WIZNET_W5300=m
+CONFIG_WKUP_M3_RPROC=m
 CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL1251_SPI=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 0a0c1f1be..b658e96ef 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -1696,8 +1696,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
 CONFIG_FS_MBCACHE=y
@@ -3249,7 +3247,7 @@ CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_CADENCE=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
@@ -4389,7 +4387,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5362,7 +5359,6 @@ CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CS35L32 is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 4814a7e6b..19bd5d6bf 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -1679,8 +1679,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
 CONFIG_FS_MBCACHE=y
@@ -3230,7 +3228,7 @@ CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_CADENCE=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
@@ -4369,7 +4367,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5341,7 +5338,6 @@ CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CS35L32 is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 0eed0d363..403aa4ff8 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -1545,8 +1545,6 @@ CONFIG_FSI_OCC=m
 CONFIG_FSI_SBEFIFO=m
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_LBC is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
@@ -2983,7 +2981,7 @@ CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_CADENCE=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
@@ -4089,7 +4087,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5042,7 +5039,6 @@ CONFIG_SND_SOC_AK5558=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CS35L32 is not set
@@ -5345,7 +5341,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 0c1f891d1..c6a1a81ed 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -1528,8 +1528,6 @@ CONFIG_FSI_OCC=m
 CONFIG_FSI_SBEFIFO=m
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_LBC is not set
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
@@ -2963,7 +2961,7 @@ CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_CADENCE=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
@@ -4067,7 +4065,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5019,7 +5016,6 @@ CONFIG_SND_SOC_AK5558=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CS35L32 is not set
@@ -5322,7 +5318,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index fd5798aaa..23368e365 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -1546,8 +1546,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
 CONFIG_FS_MBCACHE=y
@@ -2959,7 +2957,7 @@ CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_CADENCE=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
@@ -4018,7 +4016,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QDIO=m
 CONFIG_QEDE=m
@@ -4983,7 +4980,6 @@ CONFIG_SND_SOC_AK5558=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CS35L32 is not set
@@ -5280,7 +5276,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 7e82b27b6..9262ddacb 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -1529,8 +1529,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
 CONFIG_FS_MBCACHE=y
@@ -2939,7 +2937,7 @@ CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_CADENCE=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
@@ -3996,7 +3994,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QDIO=m
 CONFIG_QEDE=m
@@ -4960,7 +4957,6 @@ CONFIG_SND_SOC_AK5558=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 # CONFIG_SND_SOC_CS35L32 is not set
@@ -5257,7 +5253,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL=y
 # CONFIG_SYSFS_DEPRECATED is not set
-CONFIG_SYSTEM76_ACPI=m
 CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
 CONFIG_SYSTEM_BLACKLIST_KEYRING=y
 # CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index bdcbf9b7a..3a8672b6b 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -1734,8 +1734,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
 CONFIG_FS_MBCACHE=y
@@ -3297,7 +3295,7 @@ CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_CADENCE=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
@@ -4430,7 +4428,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5413,7 +5410,6 @@ CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 4c83d7b02..ca547a8a7 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -1717,8 +1717,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
 # CONFIG_FSL_EDMA is not set
-# CONFIG_FSL_ENETC_MDIO is not set
-CONFIG_FSL_ENETC_QOS=y
 # CONFIG_FSL_PQ_MDIO is not set
 # CONFIG_FSL_QDMA is not set
 CONFIG_FS_MBCACHE=y
@@ -3278,7 +3276,7 @@ CONFIG_MMC_SDHCI_ACPI=m
 CONFIG_MMC_SDHCI_CADENCE=m
 # CONFIG_MMC_SDHCI_F_SDH30 is not set
 CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_MILBEAUT=m
+# CONFIG_MMC_SDHCI_MILBEAUT is not set
 # CONFIG_MMC_SDHCI_OF_ARASAN is not set
 # CONFIG_MMC_SDHCI_OF_ASPEED is not set
 # CONFIG_MMC_SDHCI_OF_AT91 is not set
@@ -4410,7 +4408,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCOM_HIDMA is not set
 # CONFIG_QCOM_HIDMA_MGMT is not set
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
-# CONFIG_QCS_Q6SSTOP_404 is not set
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_QEDE=m
 CONFIG_QEDF=m
@@ -5392,7 +5389,6 @@ CONFIG_SND_SOC_AMD_ACP3x=m
 CONFIG_SND_SOC_AMD_ACP=m
 CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
 CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
-# CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set
 CONFIG_SND_SOC_BD28623=m
 # CONFIG_SND_SOC_BT_SCO is not set
 CONFIG_SND_SOC_CROS_EC_CODEC=m
diff --git a/kernel.spec b/kernel.spec
index 832543414..a56bfafbe 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -813,7 +813,7 @@ Patch302: ACPI-scan-Fix-regression-related-to-X-Gene-UARTs.patch
 # rhbz 1574718
 Patch303: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
 
-Patch305: ARM-tegra-usb-no-reset.patch
+Patch304: ARM-tegra-usb-no-reset.patch
 
 # Tegra bits
 Patch320: arm64-tegra-jetson-tx1-fixes.patch