diff --git a/baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP b/baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP
similarity index 100%
rename from baseconfig/arm/armv7/CONFIG_ROCKCHIP_CDN_DP
rename to baseconfig/arm/CONFIG_ROCKCHIP_CDN_DP
diff --git a/baseconfig/arm/armv7/CONFIG_REGULATOR_ACT8865 b/baseconfig/arm/armv7/CONFIG_REGULATOR_ACT8865
deleted file mode 100644
index f1e82abd5..000000000
--- a/baseconfig/arm/armv7/CONFIG_REGULATOR_ACT8865
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_REGULATOR_ACT8865 is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 24424629a..3d89e6961 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4255,6 +4255,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=m
+# CONFIG_ROCKCHIP_CDN_DP is not set
 CONFIG_ROCKCHIP_DW_HDMI=m
 CONFIG_ROCKCHIP_DW_MIPI_DSI=m
 CONFIG_ROCKCHIP_EFUSE=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 95ecda6ca..505d4810a 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4233,6 +4233,7 @@ CONFIG_RMI4_I2C=m
 CONFIG_RMI4_SMB=m
 CONFIG_RMI4_SPI=m
 CONFIG_ROCKCHIP_ANALOGIX_DP=m
+# CONFIG_ROCKCHIP_CDN_DP is not set
 CONFIG_ROCKCHIP_DW_HDMI=m
 CONFIG_ROCKCHIP_DW_MIPI_DSI=m
 CONFIG_ROCKCHIP_EFUSE=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 9e4321b25..2982f5267 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4511,7 +4511,7 @@ CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PM800 is not set
-# CONFIG_REGULATOR_ACT8865 is not set
+CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_AS3722=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 0710a1a1b..c04bb8517 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4244,7 +4244,7 @@ CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP=y
-# CONFIG_REGULATOR_ACT8865 is not set
+CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_AD5398=m
 # CONFIG_REGULATOR_ANATOP is not set
 CONFIG_REGULATOR_AS3722=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index fd495dd52..2f48a6c6a 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4222,7 +4222,7 @@ CONFIG_REGMAP_IRQ=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP=y
-# CONFIG_REGULATOR_ACT8865 is not set
+CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_AD5398=m
 # CONFIG_REGULATOR_ANATOP is not set
 CONFIG_REGULATOR_AS3722=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 9d2612878..d6dc918c2 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4489,7 +4489,7 @@ CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PM800 is not set
-# CONFIG_REGULATOR_ACT8865 is not set
+CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_AS3722=m