diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index d14b20dd2398..88f4946d963a 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -90,11 +90,17 @@ config GKI_HIDDEN_GPIO_CONFIGS
 	  These are normally selected implicitly when a module
 	  that relies on it is configured.
 
+# If this file is included on a 32-bit allmodconfig build, the select for
+# IOMMU_IO_PGTABLE_LPAE will trigger an "unmet direct dependency" warning
+# because this option is incompatible with GENERIC_ATOMIC64, which is
+# required by CPU_V6 and implied by ARCH_BCM2835. ARCH_BCM2835 is enabled
+# in the ARM defconfig (multi_v7_defconfig) and implied by many BCM2835
+# drivers, so it is lower impact to disable IOMMU_IO_PGTABLE_LPAE here
 config GKI_HIDDEN_QCOM_CONFIGS
 	bool "Hidden QCOM configs needed for GKI"
 	select QCOM_SMEM_STATE
 	select QCOM_GDSC if (ARCH_QCOM)
-	select IOMMU_IO_PGTABLE_LPAE if (ARCH_QCOM)
+	select IOMMU_IO_PGTABLE_LPAE if (ARCH_QCOM && 64BIT)
 	select INTERCONNECT_QCOM if (ARCH_QCOM)
 	select AUXILIARY_BUS if (ARCH_QCOM)