diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment
index dde45fc3dda0..c960dbe80a13 100644
--- a/arch/arm64/configs/db845c_gki.fragment
+++ b/arch/arm64/configs/db845c_gki.fragment
@@ -43,7 +43,10 @@ CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_ULPI_BUS=m
 CONFIG_MMC_SDHCI_MSM=m
 CONFIG_RTC_DRV_PM8XXX=m
+CONFIG_COMMON_CLK_QCOM=m
 CONFIG_COMMON_CLK_SCMI=m
+CONFIG_SDM_GPUCC_845=m
+CONFIG_QCOM_CLK_RPMH=m
 CONFIG_MSM_GCC_8998=m
 CONFIG_SDM_DISPCC_845=m
 CONFIG_HWSPINLOCK_QCOM=m
diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index bd5e645c8944..ba4480dede94 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -68,6 +68,7 @@ config GKI_HIDDEN_QCOM_CONFIGS
 	bool "Hidden QCOM configs needed for GKI"
 	select QCOM_SMEM_STATE
 	select QCOM_SCM if (ARM64)
+	select QCOM_GDSC if (ARCH_QCOM)
 	select PINCTRL_MSM if (PINCTRL && ARCH_QCOM)
 	help
 	  Dummy config option used to enable hidden QCOM configs.
@@ -76,9 +77,6 @@ config GKI_HIDDEN_QCOM_CONFIGS
 
 config GKI_QCOM_CLKS_CONFIGS
 	bool "QCOM clk drivers needed for GKI due to powerdomain restrictions"
-	select COMMON_CLK_QCOM	if (ARCH_QCOM)
-	select QCOM_CLK_RPMH	if (ARCH_QCOM)
-	select SDM_GPUCC_845	if (ARCH_QCOM)
 	select QCOM_RPMHPD	if (ARCH_QCOM)
 	help
 	  This config option selects various QCOM clk drivers that