diff --git a/arch/arm64/configs/db845c_gki.fragment b/arch/arm64/configs/db845c_gki.fragment
index 141c11776aeb..0a23e10ab72c 100644
--- a/arch/arm64/configs/db845c_gki.fragment
+++ b/arch/arm64/configs/db845c_gki.fragment
@@ -97,3 +97,6 @@ CONFIG_QCOM_GLINK_SSR=m
 CONFIG_RPMSG_QCOM_GLINK_RPM=m
 CONFIG_QCOM_SMD_RPM=m
 CONFIG_QCOM_RPMPD=m
+CONFIG_QCOM_PDC=m
+CONFIG_QCOM_SCM=m
+CONFIG_ARM_SMMU=m
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 81ded8495712..1359cee2530a 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -377,7 +377,6 @@ CONFIG_ION_SYSTEM_HEAP=y
 CONFIG_COMMON_CLK_SCPI=y
 CONFIG_HWSPINLOCK=y
 CONFIG_MAILBOX=y
-CONFIG_ARM_SMMU=y
 CONFIG_REMOTEPROC=y
 CONFIG_RPMSG_CHAR=y
 CONFIG_QCOM_COMMAND_DB=y
@@ -389,7 +388,6 @@ CONFIG_IIO=y
 CONFIG_IIO_BUFFER=y
 CONFIG_IIO_TRIGGER=y
 CONFIG_PWM=y
-CONFIG_QCOM_PDC=y
 CONFIG_GENERIC_PHY=y
 CONFIG_ANDROID=y
 CONFIG_ANDROID_BINDER_IPC=y
diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index a5e8f88c618e..b342a9434b7f 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -72,9 +72,9 @@ config GKI_HIDDEN_GPIO_CONFIGS
 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)
+	select IOMMU_IO_PGTABLE_LPAE if (ARCH_QCOM)
+
 	help
 	  Dummy config option used to enable hidden QCOM configs.
 	  These are normally selected implicitly when a module