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 a01cac224..8dc4af80e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -992,7 +992,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
 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
@@ -3320,7 +3320,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_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -4819,7 +4819,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 da2371212..e40eda739 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -992,7 +992,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
 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
@@ -3299,7 +3299,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_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -4796,7 +4796,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 defea7467..a9582e003 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1023,7 +1023,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
@@ -3487,7 +3487,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_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -5101,7 +5101,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 2fd50f2e9..4a454ab5e 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -990,7 +990,7 @@ CONFIG_CNIC=m
 CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
 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
@@ -3337,7 +3337,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_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -4814,7 +4814,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 baf16c6cb..fac967b68 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -989,7 +989,7 @@ CONFIG_CNIC=m
 CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_COMMON_CLK_MAX9485 is not set
 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
@@ -3316,7 +3316,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_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -4791,7 +4791,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 368aca682..8cf089b45 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1022,7 +1022,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
@@ -3466,7 +3466,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_ROHM_BD718XX is not set
 # CONFIG_MFD_RT5033 is not set
@@ -5078,7 +5078,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