diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index be475727cef2..2c6f92b15ea3 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -56,6 +56,18 @@ config GKI_HIDDEN_QCOM_CONFIGS
 	  These are normally selected implicitely when a module
 	  that relies on it is configured.
 
+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
+	  cannot be built as a module currently due to power-domain
+	  deferred probing limitations.
+	  See https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e01afc32502555beb2057ddd74401be38475d851
+
 config GKI_HIDDEN_MEDIA_CONFIGS
 	bool "Hidden Media configs needed for GKI"
 	select VIDEOBUF2_CORE
@@ -101,6 +113,7 @@ config GKI_HACKS_TO_FIX
 	select GKI_HIDDEN_QCOM_CONFIGS
 	select GKI_LEGACY_WEXT_ALLCONFIG
 	select GKI_HIDDEN_MEDIA_CONFIGS
+	select GKI_QCOM_CLKS_CONFIGS
 	help
 	  Dummy config option used to enable core functionality used by
 	  modules that may not be selectable in this config.