diff --git a/arch/arm64/configs/vendor/ext_config/devon-default.config b/arch/arm64/configs/vendor/ext_config/devon-default.config
index af529d8afdc9..8ddda7f3fcd7 100644
--- a/arch/arm64/configs/vendor/ext_config/devon-default.config
+++ b/arch/arm64/configs/vendor/ext_config/devon-default.config
@@ -61,7 +61,10 @@ CONFIG_CAMERA_FLASH_IIC_COMPATIBLE=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
 CONFIG_LRU_GEN=y
 CONFIG_LRU_GEN_ENABLED=y
+CONFIG_ADAPTER_CLASS=m
+CONFIG_AW9610X_SAR=m
 CONFIG_BQ2597X_MMI_IIO=m
+CONFIG_CW2217B_FG_MMI=m
 CONFIG_INPUT_EGISTEC_BIX=m
 CONFIG_INPUT_MISC_FPC1020=m
 CONFIG_INPUT_MISC_FPC1020_SAVE_TO_CLASS_DEVICE=y
@@ -79,6 +82,9 @@ CONFIG_LDO_VIBRATOR_MMI=m
 CONFIG_LEDS_AW99703=m
 CONFIG_LEDS_INDICATOR_PWM=m
 CONFIG_LEDS_LM3697=m
+CONFIG_MMI_CHARGER=m
+CONFIG_MMI_DISCRETE_CHARGER=m
+CONFIG_MMI_DISCRETE_CHARGER_CLASS=m
 CONFIG_MMI_DISCRETE_TURBO_CHARGER=m
 CONFIG_MMI_QC3P_WT6670_DETECTED=y
 CONFIG_MMI_QC3P_WT6670F=m
@@ -87,7 +93,12 @@ CONFIG_MMI_SGM41513_CHARGER=y
 CONFIG_NFC_ST21NFC=m
 CONFIG_REGULATOR_VIBRATOR_MMI=m
 CONFIG_REGULATOR_WL2864C=m
+CONFIG_RT_PD_MANAGER=m
 CONFIG_RT9471_CHG_MMI=m
+CONFIG_SGM4154X_CHARGER=m
+CONFIG_SM5602_FQ_MMI=m
+CONFIG_TCPC_CLASS=m
+CONFIG_TCPC_SGM7220=m
 CONFIG_TCPC_MAX_POLLING_COUNT=130
 CONFIG_TOUCHSCREEN_NT36xxx_HOSTDL_SPI_MMI=m
 CONFIG_VIBRATOR_NOISE_CAMERA=y
diff --git a/arch/arm64/configs/vendor/ext_config/hawao-default.config b/arch/arm64/configs/vendor/ext_config/hawao-default.config
index d0d8bdf161aa..04061b698a10 100644
--- a/arch/arm64/configs/vendor/ext_config/hawao-default.config
+++ b/arch/arm64/configs/vendor/ext_config/hawao-default.config
@@ -59,7 +59,10 @@ CONFIG_CAMERA_FLASH_IIC_COMPATIBLE=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
 #Add this for hawao longer the sd dedoune time
 CONFIG_SD_INSERT_DEBOUNCE_DELAY_LONGER=y
+CONFIG_ADAPTER_CLASS=m
+CONFIG_AW9610X_SAR=m
 CONFIG_BQ2589X_CHARGER=m
+CONFIG_CW2217B_FG_MMI=m
 CONFIG_INPUT_CHIPONE_FPS_MMI=m
 CONFIG_INPUT_CHIPONE_FPS_SUPPORT_POWER_GPIO=y
 CONFIG_INPUT_EGIS_FPS=m
@@ -68,8 +71,16 @@ CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V2_MMI_ENABLE_DOUBLE_TAP=y
 CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V2_MMI_IC_NAME="ft3519"
 CONFIG_INPUT_TOUCHSCREEN_MMI=m
 CONFIG_LEDS_INDICATOR_PWM=m
+CONFIG_MMI_CHARGER=m
+CONFIG_MMI_DISCRETE_CHARGER=m
+CONFIG_MMI_DISCRETE_CHARGER_CLASS=m
 CONFIG_MMI_RECHARGER_HAWAO_MODE=y
 CONFIG_MMI_RELAY=m
 CONFIG_REGULATOR_VIBRATOR_MMI=m
 CONFIG_REGULATOR_WL2864C=m
+CONFIG_RT_PD_MANAGER=m
+CONFIG_SGM4154X_CHARGER=m
+CONFIG_SM5602_FQ_MMI=m
+CONFIG_TCPC_CLASS=m
+CONFIG_TCPC_SGM7220=m
 CONFIG_VIBRATOR_NOISE_CAMERA=y
diff --git a/arch/arm64/configs/vendor/ext_config/moto-bengal.config b/arch/arm64/configs/vendor/ext_config/moto-bengal.config
index 79d777361ce8..c33ce5a9690d 100644
--- a/arch/arm64/configs/vendor/ext_config/moto-bengal.config
+++ b/arch/arm64/configs/vendor/ext_config/moto-bengal.config
@@ -68,28 +68,17 @@ CONFIG_ION_POOL_FILL_MARK=16
 CONFIG_DEBUG_BUGVERBOSE=n
 # CONFIG_SLAB_MERGE_DEFAULT is not set
 CONFIG_QCA_CLD_WLAN=m
-CONFIG_ADAPTER_CLASS=m
-CONFIG_AW9610X_SAR=m
 CONFIG_CAMERA_CCI_DEBUG_INTF=m
-CONFIG_CW2217B_FG_MMI=m
 CONFIG_EXFAT_FS=m
 CONFIG_INPUT_QPNP_POWER_ON_MMI=m
 CONFIG_MMI_ANNOTATE=m
-CONFIG_MMI_CHARGER=m
-CONFIG_MMI_DISCRETE_CHARGER=m
-CONFIG_MMI_DISCRETE_CHARGER_CLASS=m
 CONFIG_MMI_INFO=m
 CONFIG_MMI_SYS_TEMP=m
 CONFIG_MOTO_F_USBNET=m
 CONFIG_MOTO_UTAGS=m
 CONFIG_QPNP_ADAPTIVE_CHARGE=m
-CONFIG_RT_PD_MANAGER=m
 CONFIG_SENSORS_CLASS=m
 CONFIG_SENSORS_SSC=y
-CONFIG_SGM4154X_CHARGER=m
-CONFIG_SM5602_FQ_MMI=m
-CONFIG_TCPC_CLASS=m
-CONFIG_TCPC_SGM7220=m
 CONFIG_TZLOG_DUMP=m
 CONFIG_WATCHDOG_CPU_CTX=m
 CONFIG_WATCHDOGTEST=m
diff --git a/arch/arm64/configs/vendor/ext_config/rhode-default.config b/arch/arm64/configs/vendor/ext_config/rhode-default.config
index c92e44330eec..f9a8ca6fc45d 100644
--- a/arch/arm64/configs/vendor/ext_config/rhode-default.config
+++ b/arch/arm64/configs/vendor/ext_config/rhode-default.config
@@ -51,20 +51,31 @@ CONFIG_ZRAM_WRITEBACK=y
 # CONFIG_QCOM_FSA4480_I2C is not set
 CONFIG_CRYPTO_LZ4=y
 CONFIG_CRYPTO_CHACHA20POLY1305=y
+CONFIG_ADAPTER_CLASS=m
+CONFIG_AW9610X_SAR=m
 CONFIG_BQ2589X_CHARGER=m
 CONFIG_BQ2597X_MMI_IIO=m
+CONFIG_CW2217B_FG_MMI=m
 CONFIG_INPUT_EGIS_FPS=m
 CONFIG_INPUT_FOCAL_FPS=m
 CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3=m
 CONFIG_INPUT_TOUCHSCREEN_FOCALTECH_V3_MMI_ENABLE_DOUBLE_TAP=y
 CONFIG_INPUT_TOUCHSCREEN_MMI=m
 CONFIG_LDO_VIBRATOR_MMI=m
+CONFIG_MMI_CHARGER=m
+CONFIG_MMI_DISCRETE_CHARGER=m
+CONFIG_MMI_DISCRETE_CHARGER_CLASS=m
 CONFIG_MMI_DISCRETE_TURBO_CHARGER=m
 CONFIG_MMI_QC3P_WT6670_DETECTED=y
 CONFIG_MMI_QC3P_WT6670F=m
 CONFIG_MMI_QC3P_Z350_DETECTED=y
 CONFIG_MMI_RELAY=m
 CONFIG_REGULATOR_WL2866D=m
+CONFIG_RT_PD_MANAGER=m
+CONFIG_SGM4154X_CHARGER=m
+CONFIG_SM5602_FQ_MMI=m
+CONFIG_TCPC_CLASS=m
+CONFIG_TCPC_SGM7220=m
 CONFIG_TOUCHSCREEN_GOODIX_BRL=m
 CONFIG_TOUCHSCREEN_GOODIX_BRL_SPI=y
 CONFIG_TOUCHSCREEN_SYNA_TCM2=m