diff --git a/arch/arm64/configs/vendor/pineapple_GKI.config b/arch/arm64/configs/vendor/pineapple_GKI.config
index a3ce005a16fb..e70d7764b748 100644
--- a/arch/arm64/configs/vendor/pineapple_GKI.config
+++ b/arch/arm64/configs/vendor/pineapple_GKI.config
@@ -1,4 +1,7 @@
 CONFIG_ARCH_PINEAPPLE=y
+CONFIG_ARM_SMMU=m
+CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y
+CONFIG_ARM_SMMU_QCOM=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_LOCALVERSION="-gki"
 # CONFIG_MODULE_SIG_ALL is not set
diff --git a/modules.list.msm.pineapple b/modules.list.msm.pineapple
index c9654e88e415..3a0492e884a8 100644
--- a/modules.list.msm.pineapple
+++ b/modules.list.msm.pineapple
@@ -1,3 +1,4 @@
+arm_smmu.ko
 qcom-scm.ko
 pinctrl-msm.ko
 pinctrl-pineapple.ko