diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index 5ba6076076d5..be475727cef2 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -50,6 +50,7 @@ config GKI_HIDDEN_GPIO_CONFIGS
 config GKI_HIDDEN_QCOM_CONFIGS
 	bool "Hidden QCOM configs needed for GKI"
 	select QCOM_SMEM_STATE
+	select PINCTRL_MSM if (PINCTRL && ARCH_QCOM)
 	help
 	  Dummy config option used to enable hidden QCOM configs.
 	  These are normally selected implicitely when a module