Minor cleanups and consolidation of AllWinner configs

66 files changed, 19 insertions, 41 deletions

diff --git a/configs/fedora/generic/CONFIG_DRM_SUN6I_DSI b/configs/fedora/generic/CONFIG_DRM_SUN6I_DSI
deleted file mode 100644
index f3a5cf0ad..000000000
--- a/configs/fedora/generic/CONFIG_DRM_SUN6I_DSI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DRM_SUN6I_DSI is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_AXP20X_ADC b/configs/fedora/generic/arm/CONFIG_AXP20X_ADC
index 025239f25..025239f25 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_AXP20X_ADC
+++ b/configs/fedora/generic/arm/CONFIG_AXP20X_ADC
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_AXP20X_POWER b/configs/fedora/generic/arm/CONFIG_AXP20X_POWER
index ddf89f551..ddf89f551 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_AXP20X_POWER
+++ b/configs/fedora/generic/arm/CONFIG_AXP20X_POWER
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_AXP20X b/configs/fedora/generic/arm/CONFIG_BATTERY_AXP20X
index 75591a277..75591a277 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_BATTERY_AXP20X
+++ b/configs/fedora/generic/arm/CONFIG_BATTERY_AXP20X
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CAN_SUN4I b/configs/fedora/generic/arm/CONFIG_CAN_SUN4I
index 925f02a15..925f02a15 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_CAN_SUN4I
+++ b/configs/fedora/generic/arm/CONFIG_CAN_SUN4I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_CHARGER_AXP20X b/configs/fedora/generic/arm/CONFIG_CHARGER_AXP20X
index 2e64e7733..2e64e7733 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_CHARGER_AXP20X
+++ b/configs/fedora/generic/arm/CONFIG_CHARGER_AXP20X
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_CRYPTO_DEV_SUN4I_SS b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS
index 957fb4e1d..957fb4e1d 100644
--- a/configs/fedora/generic/arm/armv7/CONFIG_CRYPTO_DEV_SUN4I_SS
+++ b/configs/fedora/generic/arm/CONFIG_CRYPTO_DEV_SUN4I_SS
diff --git a/configs/fedora/generic/arm/CONFIG_DMA_SUN4I b/configs/fedora/generic/arm/CONFIG_DMA_SUN4I
new file mode 100644
index 000000000..95a4adfeb
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_DMA_SUN4I
@@ -0,0 +1 @@
+# CONFIG_DMA_SUN4I is not set
diff --git a/configs/fedora/generic/arm/CONFIG_DMA_SUN6I b/configs/fedora/generic/arm/CONFIG_DMA_SUN6I
index 9c50f4fed..83eeb271f 100644
--- a/configs/fedora/generic/arm/CONFIG_DMA_SUN6I
+++ b/configs/fedora/generic/arm/CONFIG_DMA_SUN6I
@@ -1 +1 @@
-# CONFIG_DMA_SUN6I is not set
+CONFIG_DMA_SUN6I=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_SUN8I b/configs/fedora/generic/arm/CONFIG_DWMAC_SUN8I
index ce05f93b3..ce05f93b3 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_DWMAC_SUN8I
+++ b/configs/fedora/generic/arm/CONFIG_DWMAC_SUN8I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_INPUT_AXP20X_PEK b/configs/fedora/generic/arm/CONFIG_INPUT_AXP20X_PEK
index e2fbdf907..e2fbdf907 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_INPUT_AXP20X_PEK
+++ b/configs/fedora/generic/arm/CONFIG_INPUT_AXP20X_PEK
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SUN4I_LRADC b/configs/fedora/generic/arm/CONFIG_KEYBOARD_SUN4I_LRADC
index 8fcbd86b6..8fcbd86b6 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_KEYBOARD_SUN4I_LRADC
+++ b/configs/fedora/generic/arm/CONFIG_KEYBOARD_SUN4I_LRADC
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MDIO_SUN4I b/configs/fedora/generic/arm/CONFIG_MDIO_SUN4I
index 5bf147832..5bf147832 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MDIO_SUN4I
+++ b/configs/fedora/generic/arm/CONFIG_MDIO_SUN4I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X
index ada79c0d1..ada79c0d1 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X
+++ b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X_I2C b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X_I2C
index 22c60295b..22c60295b 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X_I2C
+++ b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X_I2C
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X_RSB b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X_RSB
index 29150d51b..29150d51b 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_AXP20X_RSB
+++ b/configs/fedora/generic/arm/CONFIG_MFD_AXP20X_RSB
diff --git a/configs/fedora/generic/arm/CONFIG_MFD_SUN4I_GPADC b/configs/fedora/generic/arm/CONFIG_MFD_SUN4I_GPADC
new file mode 100644
index 000000000..1c0bb306a
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MFD_SUN4I_GPADC
@@ -0,0 +1 @@
+# CONFIG_MFD_SUN4I_GPADC is not set
diff --git a/configs/fedora/generic/arm/CONFIG_MFD_SUN6I_PRCM b/configs/fedora/generic/arm/CONFIG_MFD_SUN6I_PRCM
new file mode 100644
index 000000000..f4c258168
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_MFD_SUN6I_PRCM
@@ -0,0 +1 @@
+# CONFIG_MFD_SUN6I_PRCM is not set
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_SUN4I_USB b/configs/fedora/generic/arm/CONFIG_PHY_SUN4I_USB
index f619228c3..f619228c3 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_SUN4I_USB
+++ b/configs/fedora/generic/arm/CONFIG_PHY_SUN4I_USB
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_SUN9I_USB b/configs/fedora/generic/arm/CONFIG_PHY_SUN9I_USB
index 98d002535..98d002535 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PHY_SUN9I_USB
+++ b/configs/fedora/generic/arm/CONFIG_PHY_SUN9I_USB
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_PWM_SUN4I b/configs/fedora/generic/arm/CONFIG_PWM_SUN4I
index d4f562f3f..d4f562f3f 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_PWM_SUN4I
+++ b/configs/fedora/generic/arm/CONFIG_PWM_SUN4I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_AXP20X b/configs/fedora/generic/arm/CONFIG_REGULATOR_AXP20X
index 6694810a6..6694810a6 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_AXP20X
+++ b/configs/fedora/generic/arm/CONFIG_REGULATOR_AXP20X
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_RTC_DRV_SUN6I b/configs/fedora/generic/arm/CONFIG_RTC_DRV_SUN6I
index 54410db09..54410db09 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_RTC_DRV_SUN6I
+++ b/configs/fedora/generic/arm/CONFIG_RTC_DRV_SUN6I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SERIO_SUN4I_PS2 b/configs/fedora/generic/arm/CONFIG_SERIO_SUN4I_PS2
index aa105b326..aa105b326 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SERIO_SUN4I_PS2
+++ b/configs/fedora/generic/arm/CONFIG_SERIO_SUN4I_PS2
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_CODEC b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_CODEC
index 6cce5a1f7..6cce5a1f7 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_CODEC
+++ b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_CODEC
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_I2S b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_I2S
index d9270e25b..d9270e25b 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_I2S
+++ b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_I2S
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_SPDIF b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_SPDIF
index c0b108aba..c0b108aba 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SND_SUN4I_SPDIF
+++ b/configs/fedora/generic/arm/CONFIG_SND_SUN4I_SPDIF
diff --git a/configs/fedora/generic/arm/CONFIG_SPI_SUN6I b/configs/fedora/generic/arm/CONFIG_SPI_SUN6I
index 4ff64c12e..031cd17b9 100644
--- a/configs/fedora/generic/arm/CONFIG_SPI_SUN6I
+++ b/configs/fedora/generic/arm/CONFIG_SPI_SUN6I
@@ -1 +1 @@
-# CONFIG_SPI_SUN6I is not set
+CONFIG_SPI_SUN6I=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_TOUCHSCREEN_SUN4I b/configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_SUN4I
index af15c1f8c..af15c1f8c 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_TOUCHSCREEN_SUN4I
+++ b/configs/fedora/generic/arm/CONFIG_TOUCHSCREEN_SUN4I
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN4I_GPADC b/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN4I_GPADC
deleted file mode 100644
index d156cb188..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN4I_GPADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_SUN4I_GPADC=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SPI_SUN6I b/configs/fedora/generic/arm/aarch64/CONFIG_SPI_SUN6I
deleted file mode 100644
index 031cd17b9..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SPI_SUN6I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_SUN6I=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_SUN4I_GPADC b/configs/fedora/generic/arm/aarch64/CONFIG_SUN4I_GPADC
deleted file mode 100644
index 97139c216..000000000
--- a/configs/fedora/generic/arm/aarch64/CONFIG_SUN4I_GPADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SUN4I_GPADC=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_ADC b/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_ADC
deleted file mode 100644
index 025239f25..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_ADC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP20X_ADC=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_POWER b/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_POWER
deleted file mode 100644
index ddf89f551..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_AXP20X_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_AXP20X_POWER=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_BATTERY_AXP20X b/configs/fedora/generic/arm/armv7/CONFIG_BATTERY_AXP20X
deleted file mode 100644
index 75591a277..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_BATTERY_AXP20X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_BATTERY_AXP20X=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_CAN_SUN4I b/configs/fedora/generic/arm/armv7/CONFIG_CAN_SUN4I
deleted file mode 100644
index 925f02a15..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_CAN_SUN4I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CAN_SUN4I=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_CHARGER_AXP20X b/configs/fedora/generic/arm/armv7/CONFIG_CHARGER_AXP20X
deleted file mode 100644
index 2e64e7733..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_CHARGER_AXP20X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_CHARGER_AXP20X=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DMA_SUN6I b/configs/fedora/generic/arm/armv7/CONFIG_DMA_SUN6I
deleted file mode 100644
index 83eeb271f..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_DMA_SUN6I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMA_SUN6I=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUN8I b/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUN8I
deleted file mode 100644
index ce05f93b3..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_DWMAC_SUN8I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DWMAC_SUN8I=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_INPUT_AXP20X_PEK b/configs/fedora/generic/arm/armv7/CONFIG_INPUT_AXP20X_PEK
deleted file mode 100644
index e2fbdf907..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_INPUT_AXP20X_PEK
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_INPUT_AXP20X_PEK=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X b/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X
deleted file mode 100644
index ada79c0d1..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_AXP20X=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_I2C b/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_I2C
deleted file mode 100644
index 22c60295b..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_I2C
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_AXP20X_I2C=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_RSB b/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_RSB
deleted file mode 100644
index 29150d51b..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_MFD_AXP20X_RSB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_AXP20X_RSB=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN6I_PRCM b/configs/fedora/generic/arm/armv7/CONFIG_MFD_SUN6I_PRCM
index 1784bb288..1784bb288 100644
--- a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_SUN6I_PRCM
+++ b/configs/fedora/generic/arm/armv7/CONFIG_MFD_SUN6I_PRCM
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_PHY_SUN4I_USB b/configs/fedora/generic/arm/armv7/CONFIG_PHY_SUN4I_USB
deleted file mode 100644
index f619228c3..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_PHY_SUN4I_USB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PHY_SUN4I_USB=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_PWM_SUN4I b/configs/fedora/generic/arm/armv7/CONFIG_PWM_SUN4I
deleted file mode 100644
index d4f562f3f..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_PWM_SUN4I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM_SUN4I=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AXP20X b/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AXP20X
deleted file mode 100644
index 6694810a6..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_REGULATOR_AXP20X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_REGULATOR_AXP20X=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_SUN6I b/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_SUN6I
deleted file mode 100644
index 54410db09..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_SUN6I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_SUN6I=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_CODEC b/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_CODEC
deleted file mode 100644
index 6cce5a1f7..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_CODEC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN4I_CODEC=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_I2S b/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_I2S
deleted file mode 100644
index d9270e25b..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_I2S
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN4I_I2S=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_SPDIF b/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_SPDIF
deleted file mode 100644
index c0b108aba..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SND_SUN4I_SPDIF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SUN4I_SPDIF=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_SPI_SUN6I b/configs/fedora/generic/arm/armv7/CONFIG_SPI_SUN6I
deleted file mode 100644
index 031cd17b9..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_SPI_SUN6I
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SPI_SUN6I=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3700e4c4a..00c1331c1 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1110,6 +1110,7 @@ CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -1319,7 +1320,8 @@ CONFIG_DMA_OF=y
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
 CONFIG_DMARD10=m
-# CONFIG_DMA_SUN6I is not set
+# CONFIG_DMA_SUN4I is not set
+CONFIG_DMA_SUN6I=m
 # CONFIG_DMATEST is not set
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DM_CACHE=m
@@ -3270,8 +3272,8 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_SPMI_PMIC=m
 # CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
-CONFIG_MFD_SUN6I_PRCM=y
+# CONFIG_MFD_SUN4I_GPADC is not set
+# CONFIG_MFD_SUN6I_PRCM is not set
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
@@ -5950,7 +5952,6 @@ CONFIG_ST_UVIS25_I2C=m
 CONFIG_ST_UVIS25=m
 CONFIG_ST_UVIS25_SPI=m
 # CONFIG_SUN4I_EMAC is not set
-CONFIG_SUN4I_GPADC=m
 CONFIG_SUN50I_A64_CCU=y
 CONFIG_SUN50I_A64_UNSTABLE_TIMER=y
 CONFIG_SUN50I_DE2_BUS=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 95927c991..4994dd0c4 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1110,6 +1110,7 @@ CONFIG_CRYPTO_DEV_QCOM_RNG=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_CRYPTO_DEV_SAFEXCEL=m
 # CONFIG_CRYPTO_DEV_SP_CCP is not set
+CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_SUN4I_SS_PRNG=y
 CONFIG_CRYPTO_DEV_VIRTIO=m
 CONFIG_CRYPTO_DH=y
@@ -1310,7 +1311,8 @@ CONFIG_DMA_OF=y
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
 CONFIG_DMARD10=m
-# CONFIG_DMA_SUN6I is not set
+# CONFIG_DMA_SUN4I is not set
+CONFIG_DMA_SUN6I=m
 # CONFIG_DMATEST is not set
 CONFIG_DMA_VIRTUAL_CHANNELS=y
 CONFIG_DM_CACHE=m
@@ -3250,8 +3252,8 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 CONFIG_MFD_SPMI_PMIC=m
 # CONFIG_MFD_STMPE is not set
-CONFIG_MFD_SUN4I_GPADC=m
-CONFIG_MFD_SUN6I_PRCM=y
+# CONFIG_MFD_SUN4I_GPADC is not set
+# CONFIG_MFD_SUN6I_PRCM is not set
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TC3589X is not set
 # CONFIG_MFD_TC6393XB is not set
@@ -5927,7 +5929,6 @@ CONFIG_ST_UVIS25_I2C=m
 CONFIG_ST_UVIS25=m
 CONFIG_ST_UVIS25_SPI=m
 # CONFIG_SUN4I_EMAC is not set
-CONFIG_SUN4I_GPADC=m
 CONFIG_SUN50I_A64_CCU=y
 CONFIG_SUN50I_A64_UNSTABLE_TIMER=y
 CONFIG_SUN50I_DE2_BUS=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index cbab408fe..9b327f82a 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3429,6 +3429,7 @@ CONFIG_MFD_SM501=m
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_SUN4I_GPADC=m
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_T7L66XB=y
 # CONFIG_MFD_TC3589X is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 613ab32f8..047a2360b 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3282,6 +3282,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUN4I_GPADC=m
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC3589X is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 300edada0..3e0a1f20b 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3263,6 +3263,7 @@ CONFIG_MFD_SM501=m
 # CONFIG_MFD_SMSC is not set
 # CONFIG_MFD_STMPE is not set
 CONFIG_MFD_SUN4I_GPADC=m
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC3589X is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index b0d4ac78e..e7f7392b6 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3410,6 +3410,7 @@ CONFIG_MFD_SM501=m
 CONFIG_MFD_SPMI_PMIC=m
 CONFIG_MFD_STMPE=y
 CONFIG_MFD_SUN4I_GPADC=m
+CONFIG_MFD_SUN6I_PRCM=y
 CONFIG_MFD_SYSCON=y
 CONFIG_MFD_T7L66XB=y
 # CONFIG_MFD_TC3589X is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index cb9403d42..c18e44aaf 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -1277,7 +1277,6 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 396b55931..59498de65 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -1267,7 +1267,6 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 44124180a..8d8c73155 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -1182,7 +1182,6 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 80a02d4d5..b7fdf7adf 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -1172,7 +1172,6 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 99926a907..193cc329f 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -1182,7 +1182,6 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 1f1c8bd1d..41b7fb225 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -1172,7 +1172,6 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index d6130d162..967a8c1a9 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -1324,7 +1324,6 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 7e04bf109..0e83467ef 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -1314,7 +1314,6 @@ CONFIG_DRM_RADEON_USERPTR=y
 # CONFIG_DRM_SII902X is not set
 CONFIG_DRM_SII9234=m
 # CONFIG_DRM_SIL_SII8620 is not set
-# CONFIG_DRM_SUN6I_DSI is not set
 # CONFIG_DRM_THINE_THC63LVD1024 is not set
 # CONFIG_DRM_TINYDRM is not set
 CONFIG_DRM_TI_SN65DSI86=m