diff --git a/configs/fedora/generic/arm/CONFIG_COMMON_CLK_RK808 b/configs/fedora/generic/arm/CONFIG_COMMON_CLK_RK808
index 129ad891c..f99a3cf06 100644
--- a/configs/fedora/generic/arm/CONFIG_COMMON_CLK_RK808
+++ b/configs/fedora/generic/arm/CONFIG_COMMON_CLK_RK808
@@ -1 +1 @@
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
diff --git a/configs/fedora/generic/arm/CONFIG_MFD_RK808 b/configs/fedora/generic/arm/CONFIG_MFD_RK808
index 097860adb..305b2914f 100644
--- a/configs/fedora/generic/arm/CONFIG_MFD_RK808
+++ b/configs/fedora/generic/arm/CONFIG_MFD_RK808
@@ -1 +1 @@
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
diff --git a/configs/fedora/generic/arm/CONFIG_PWM b/configs/fedora/generic/arm/CONFIG_PWM
deleted file mode 100644
index 346c909b6..000000000
--- a/configs/fedora/generic/arm/CONFIG_PWM
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PWM=y
diff --git a/configs/fedora/generic/arm/CONFIG_REGULATOR_RK808 b/configs/fedora/generic/arm/CONFIG_REGULATOR_RK808
index 171bdf44e..71ebac06e 100644
--- a/configs/fedora/generic/arm/CONFIG_REGULATOR_RK808
+++ b/configs/fedora/generic/arm/CONFIG_REGULATOR_RK808
@@ -1 +1 @@
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index ff9de9e20..c2441e8cd 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -969,7 +969,7 @@ CONFIG_COMMON_CLK_HI655X=m
 CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=y
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
 # CONFIG_COMMON_CLK_SI514 is not set
@@ -3273,7 +3273,7 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_SEC_CORE is not set
@@ -4741,7 +4741,7 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_SY8106A=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 214a09ad1..1bd50f41f 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -969,7 +969,7 @@ CONFIG_COMMON_CLK_HI655X=m
 CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=y
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
 # CONFIG_COMMON_CLK_SI514 is not set
@@ -3252,7 +3252,7 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_SEC_CORE is not set
@@ -4718,7 +4718,7 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_SY8106A=m
 # CONFIG_REGULATOR_TPS51632 is not set
 # CONFIG_REGULATOR_TPS62360 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index ceacc3558..c631dbc2c 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1002,7 +1002,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=y
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -3441,7 +3441,7 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_RT5033 is not set
 CONFIG_MFD_SEC_CORE=y
@@ -5025,7 +5025,7 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index 7548e14be..6b7958942 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -969,7 +969,7 @@ CONFIG_CNIC=m
 # CONFIG_COMMON_CLK_CS2000_CP is not set
 CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -3290,7 +3290,7 @@ CONFIG_MFD_MAX8997=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_RT5033 is not set
 CONFIG_MFD_SEC_CORE=y
@@ -4736,7 +4736,7 @@ CONFIG_REGULATOR_PV88060=m
 # CONFIG_REGULATOR_PV88080 is not set
 CONFIG_REGULATOR_PV88090=m
 CONFIG_REGULATOR_PWM=y
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index be8a63cd2..0fb7c1f10 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -968,7 +968,7 @@ CONFIG_CNIC=m
 # CONFIG_COMMON_CLK_CS2000_CP is not set
 CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PWM=m
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -3269,7 +3269,7 @@ CONFIG_MFD_MAX8997=y
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_RT5033 is not set
 CONFIG_MFD_SEC_CORE=y
@@ -4713,7 +4713,7 @@ CONFIG_REGULATOR_PV88060=m
 # CONFIG_REGULATOR_PV88080 is not set
 CONFIG_REGULATOR_PV88090=m
 CONFIG_REGULATOR_PWM=y
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 7fac1e75d..df1a75b43 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1001,7 +1001,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 CONFIG_COMMON_CLK_PALMAS=m
 CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=y
-CONFIG_COMMON_CLK_RK808=m
+CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCMI=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -3420,7 +3420,7 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
-CONFIG_MFD_RK808=m
+CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
 # CONFIG_MFD_RT5033 is not set
 CONFIG_MFD_SEC_CORE=y
@@ -5002,7 +5002,7 @@ CONFIG_REGULATOR_PWM=y
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_REGULATOR_QCOM_SMD_RPM=m
 CONFIG_REGULATOR_QCOM_SPMI=m
-CONFIG_REGULATOR_RK808=m
+CONFIG_REGULATOR_RK808=y
 CONFIG_REGULATOR_S2MPA01=m
 CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m