diff --git a/configs/fedora/generic/arm/CONFIG_MFD_AS3722 b/configs/fedora/generic/arm/CONFIG_MFD_AS3722
index c2a67ccb7..6aa06bd4b 100644
--- a/configs/fedora/generic/arm/CONFIG_MFD_AS3722
+++ b/configs/fedora/generic/arm/CONFIG_MFD_AS3722
@@ -1 +1 @@
-CONFIG_MFD_AS3722=m
+CONFIG_MFD_AS3722=y
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_POWER_RESET_AS3722 b/configs/fedora/generic/arm/CONFIG_POWER_RESET_AS3722
similarity index 100%
rename from configs/fedora/generic/arm/armv7/CONFIG_POWER_RESET_AS3722
rename to configs/fedora/generic/arm/CONFIG_POWER_RESET_AS3722
diff --git a/configs/fedora/generic/arm/CONFIG_RTC_DRV_AS3722 b/configs/fedora/generic/arm/CONFIG_RTC_DRV_AS3722
new file mode 100644
index 000000000..2430f5b3b
--- /dev/null
+++ b/configs/fedora/generic/arm/CONFIG_RTC_DRV_AS3722
@@ -0,0 +1 @@
+CONFIG_RTC_DRV_AS3722=m
diff --git a/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_AS3722 b/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_AS3722
deleted file mode 100644
index 2b582bcab..000000000
--- a/configs/fedora/generic/arm/armv7/CONFIG_RTC_DRV_AS3722
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RTC_DRV_AS3722=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 3f9f9688c..a01cac224 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -3268,7 +3268,7 @@ CONFIG_MFD_AC100=m
 # CONFIG_MFD_ARIZONA is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_AS3711 is not set
-CONFIG_MFD_AS3722=m
+CONFIG_MFD_AS3722=y
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
@@ -4532,6 +4532,7 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_POWER9_CPU is not set
 CONFIG_POWER_AVS=y
 CONFIG_POWERCAP=y
+CONFIG_POWER_RESET_AS3722=y
 # CONFIG_POWER_RESET_BRCMKONA is not set
 # CONFIG_POWER_RESET_BRCMSTB is not set
 CONFIG_POWER_RESET_GPIO_RESTART=y
@@ -4935,6 +4936,7 @@ CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
+CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_CMOS=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 39fb240a5..da2371212 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -3247,7 +3247,7 @@ CONFIG_MFD_AC100=m
 # CONFIG_MFD_ARIZONA is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_AS3711 is not set
-CONFIG_MFD_AS3722=m
+CONFIG_MFD_AS3722=y
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
@@ -4510,6 +4510,7 @@ CONFIG_POSIX_MQUEUE=y
 # CONFIG_POWER9_CPU is not set
 CONFIG_POWER_AVS=y
 CONFIG_POWERCAP=y
+CONFIG_POWER_RESET_AS3722=y
 # CONFIG_POWER_RESET_BRCMKONA is not set
 # CONFIG_POWER_RESET_BRCMSTB is not set
 CONFIG_POWER_RESET_GPIO_RESTART=y
@@ -4912,6 +4913,7 @@ CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
+CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_CMOS=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 127bb8763..defea7467 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3434,7 +3434,7 @@ CONFIG_MFD_AC100=m
 # CONFIG_MFD_ARIZONA is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_AS3711 is not set
-CONFIG_MFD_AS3722=m
+CONFIG_MFD_AS3722=y
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
@@ -5228,7 +5228,7 @@ CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
-CONFIG_RTC_DRV_AS3722=y
+CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_CMOS=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index a9d82ca35..2fd50f2e9 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -3286,7 +3286,7 @@ CONFIG_MFD_AC100=m
 # CONFIG_MFD_ARIZONA is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_AS3711 is not set
-CONFIG_MFD_AS3722=m
+CONFIG_MFD_AS3722=y
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
@@ -4936,7 +4936,7 @@ CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
-CONFIG_RTC_DRV_AS3722=y
+CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_CMOS=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 812fa1123..baf16c6cb 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -3265,7 +3265,7 @@ CONFIG_MFD_AC100=m
 # CONFIG_MFD_ARIZONA is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_AS3711 is not set
-CONFIG_MFD_AS3722=m
+CONFIG_MFD_AS3722=y
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
@@ -4913,7 +4913,7 @@ CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
-CONFIG_RTC_DRV_AS3722=y
+CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_CMOS=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 89c373418..368aca682 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3413,7 +3413,7 @@ CONFIG_MFD_AC100=m
 # CONFIG_MFD_ARIZONA is not set
 # CONFIG_MFD_ARIZONA_SPI is not set
 # CONFIG_MFD_AS3711 is not set
-CONFIG_MFD_AS3722=m
+CONFIG_MFD_AS3722=y
 # CONFIG_MFD_ASIC3 is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 # CONFIG_MFD_ATMEL_HLCDC is not set
@@ -5205,7 +5205,7 @@ CONFIG_RTC_DRV_88PM80X=m
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_AC100=m
 CONFIG_RTC_DRV_ARMADA38X=m
-CONFIG_RTC_DRV_AS3722=y
+CONFIG_RTC_DRV_AS3722=m
 CONFIG_RTC_DRV_BQ32K=m
 CONFIG_RTC_DRV_BQ4802=m
 CONFIG_RTC_DRV_CMOS=y