diff --git a/arch/arm64/configs/vendor/holi_GKI.config b/arch/arm64/configs/vendor/holi_GKI.config
index 0f814a270340..f4b3cd049476 100644
--- a/arch/arm64/configs/vendor/holi_GKI.config
+++ b/arch/arm64/configs/vendor/holi_GKI.config
@@ -137,3 +137,8 @@ CONFIG_ICNSS2=m
 CONFIG_ICNSS2_QMI=y
 # CONFIG_ICNSS2_DEBUG is not set
 # CONFIG_CNSS_QCA6750 is not set
+CONFIG_ARM_QCOM_CPUFREQ_HW=m
+CONFIG_QCOM_CLK_SMD_RPM=m
+CONFIG_SM_GPUCC_HOLI=m
+CONFIG_SM_DISPCC_HOLI=m
+CONFIG_SM_DEBUGCC_HOLI=m
diff --git a/arch/arm64/configs/vendor/holi_QGKI.config b/arch/arm64/configs/vendor/holi_QGKI.config
index 416f613d624d..ee231ed16299 100644
--- a/arch/arm64/configs/vendor/holi_QGKI.config
+++ b/arch/arm64/configs/vendor/holi_QGKI.config
@@ -143,3 +143,8 @@ CONFIG_QTI_CPU_ISOLATE_COOLING_DEVICE=y
 CONFIG_REGULATOR_COOLING_DEVICE=y
 CONFIG_QTI_RPM_SMD_COOLING_DEVICE=y
 CONFIG_CFG80211_INTERNAL_REGDB=y
+CONFIG_SM_GPUCC_HOLI=y
+CONFIG_SM_DISPCC_HOLI=y
+CONFIG_SM_DEBUGCC_HOLI=y
+CONFIG_ARM_QCOM_CPUFREQ_HW=y
+CONFIG_QCOM_CLK_SMD_RPM=y
diff --git a/arch/arm64/configs/vendor/holi_debug.config b/arch/arm64/configs/vendor/holi_debug.config
index b17b335a64d3..c026199b971a 100644
--- a/arch/arm64/configs/vendor/holi_debug.config
+++ b/arch/arm64/configs/vendor/holi_debug.config
@@ -47,7 +47,6 @@ CONFIG_PCI_MSM_MSI=y
 CONFIG_MHI_BUS=y
 CONFIG_MHI_DEBUG=y
 CONFIG_MHI_UCI=y
-CONFIG_ARM_QCOM_CPUFREQ_HW=y
 CONFIG_THERMAL_TSENS=y
 # CONFIG_USB_F_FS_IPC_LOGGING is not set
 # CONFIG_MSM_JTAGV8 is not set
@@ -106,16 +105,11 @@ CONFIG_CRC8=y
 CONFIG_MSM_REMOTEQDSS=y
 CONFIG_LKDTM=y
 CONFIG_MSM_RPM_SMD=y
-CONFIG_SM_GCC_HOLI=y
 CONFIG_DEBUG_PANIC_ON_OOM=y
 CONFIG_KPROBES=y
-CONFIG_QCOM_CLK_SMD_RPM=y
 CONFIG_QCOM_MPM=y
-CONFIG_SM_GPUCC_HOLI=y
 CONFIG_ICNSS2_DEBUG=y
 # CONFIG_CLD_LL_CORE is not set
 # CONFIG_NL80211_TESTMODE is not set
-CONFIG_SM_DISPCC_HOLI=y
-CONFIG_SM_DEBUGCC_HOLI=y
 CONFIG_INTERCONNECT_TEST=y
 CONFIG_INTERCONNECT_QCOM_HOLI=y