diff --git a/config/kernel/linux-thead-current.config b/config/kernel/linux-thead-current.config
index 2c2d049ffc..b8c2489d31 100644
--- a/config/kernel/linux-thead-current.config
+++ b/config/kernel/linux-thead-current.config
@@ -3446,7 +3446,7 @@ CONFIG_SENSORS_DRIVETEMP=m
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_TC654 is not set
 # CONFIG_SENSORS_TPS23861 is not set
-# CONFIG_SENSORS_MR75203 is not set
+CONFIG_SENSORS_MR75203=m
 # CONFIG_SENSORS_ADCXX is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM70 is not set
@@ -3477,7 +3477,7 @@ CONFIG_SENSORS_DRIVETEMP=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
-# CONFIG_SENSORS_PWM_FAN is not set
+CONFIG_SENSORS_PWM_FAN=m
 # CONFIG_SENSORS_SBTSI is not set
 # CONFIG_SENSORS_SBRMI is not set
 # CONFIG_SENSORS_SHT15 is not set
@@ -5816,7 +5816,7 @@ CONFIG_REMOTEPROC_CDEV=y
 #
 CONFIG_RPMSG=y
 CONFIG_RPMSG_CHAR=y
-# CONFIG_RPMSG_CTRL is not set
+CONFIG_RPMSG_CTRL=y
 CONFIG_RPMSG_NS=y
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_THEAD_LIGHT=y
diff --git a/config/kernel/linux-thead-edge.config b/config/kernel/linux-thead-edge.config
index 22d2d57755..b69fce2bd5 100644
--- a/config/kernel/linux-thead-edge.config
+++ b/config/kernel/linux-thead-edge.config
@@ -2129,13 +2129,13 @@ CONFIG_MD=y
 CONFIG_BLK_DEV_MD=y
 CONFIG_MD_AUTODETECT=y
 CONFIG_MD_BITMAP_FILE=y
-# CONFIG_MD_LINEAR is not set
+CONFIG_MD_LINEAR=m
 CONFIG_MD_RAID0=m
 CONFIG_MD_RAID1=m
 CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
-# CONFIG_MD_MULTIPATH is not set
-# CONFIG_MD_FAULTY is not set
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
 # CONFIG_MD_CLUSTER is not set
 CONFIG_BCACHE=m
 # CONFIG_BCACHE_DEBUG is not set
@@ -2641,7 +2641,7 @@ CONFIG_BRCMFMAC_SDIO=y
 CONFIG_BRCMFMAC_USB=y
 # CONFIG_BRCM_TRACING is not set
 # CONFIG_BRCMDBG is not set
-CONFIG_WLAN_VENDOR_CISCO=y
+# CONFIG_WLAN_VENDOR_CISCO is not set
 CONFIG_WLAN_VENDOR_INTEL=y
 CONFIG_WLAN_VENDOR_INTERSIL=y
 # CONFIG_HOSTAP is not set
@@ -2767,7 +2767,7 @@ CONFIG_WLAN_VENDOR_ZYDAS=y
 CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_WLAN_VENDOR_QUANTENNA=y
-# CONFIG_USB_NET_RNDIS_WLAN is not set
+CONFIG_USB_NET_RNDIS_WLAN=m
 CONFIG_MAC80211_HWSIM=m
 CONFIG_VIRT_WIFI=m
 # CONFIG_WAN is not set
@@ -3243,6 +3243,7 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=y
 
 CONFIG_PINCTRL=y
 CONFIG_PINMUX=y
+CONFIG_GENERIC_PINMUX_FUNCTIONS=y
 CONFIG_PINCONF=y
 CONFIG_GENERIC_PINCONF=y
 # CONFIG_DEBUG_PINCTRL is not set
@@ -3253,7 +3254,7 @@ CONFIG_PINCTRL_CY8C95X0=m
 # CONFIG_PINCTRL_SINGLE is not set
 # CONFIG_PINCTRL_STMFX is not set
 # CONFIG_PINCTRL_SX150X is not set
-# CONFIG_PINCTRL_TH1520 is not set
+CONFIG_PINCTRL_TH1520=y
 
 #
 # Renesas pinctrl drivers
@@ -3463,7 +3464,7 @@ CONFIG_SENSORS_DRIVETEMP=m
 # CONFIG_SENSORS_MCP3021 is not set
 # CONFIG_SENSORS_TC654 is not set
 # CONFIG_SENSORS_TPS23861 is not set
-# CONFIG_SENSORS_MR75203 is not set
+CONFIG_SENSORS_MR75203=m
 # CONFIG_SENSORS_ADCXX is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM70 is not set
@@ -3494,7 +3495,7 @@ CONFIG_SENSORS_DRIVETEMP=m
 # CONFIG_SENSORS_OCC_P8_I2C is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_PMBUS is not set
-# CONFIG_SENSORS_PWM_FAN is not set
+CONFIG_SENSORS_PWM_FAN=m
 # CONFIG_SENSORS_SBTSI is not set
 # CONFIG_SENSORS_SBRMI is not set
 # CONFIG_SENSORS_SHT15 is not set
@@ -5847,7 +5848,7 @@ CONFIG_REMOTEPROC_CDEV=y
 #
 CONFIG_RPMSG=y
 CONFIG_RPMSG_CHAR=y
-# CONFIG_RPMSG_CTRL is not set
+CONFIG_RPMSG_CTRL=y
 CONFIG_RPMSG_NS=y
 # CONFIG_RPMSG_QCOM_GLINK_RPM is not set
 CONFIG_RPMSG_THEAD_LIGHT=y
@@ -6185,9 +6186,9 @@ CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
 #
 # Caches
 #
-CONFIG_NETFS_SUPPORT=y
+CONFIG_NETFS_SUPPORT=m
 CONFIG_NETFS_STATS=y
-CONFIG_FSCACHE=y
+CONFIG_FSCACHE=m
 CONFIG_FSCACHE_STATS=y
 # CONFIG_FSCACHE_DEBUG is not set
 CONFIG_CACHEFILES=m