From 3f0fb2fde05a56b0789edbfb4459452e1b0356e7 Mon Sep 17 00:00:00 2001
From: Chun-Hung Wu <chun-hung.wu@mediatek.com>
Date: Wed, 16 Sep 2020 09:54:05 +0800
Subject: [PATCH] ANDROID: iommu: Enable CONFIG_IOMMU_IO_PGTABLE_ARMV7S

Enable CONFIG_IOMMU_IO_PGTABLE_ARMV7S in gki_defconfig for MTK
iommu/io-pgtable-arm-v7s.

Bug: 167939345
Link: https://lore.kernel.org/patchwork/patch/1301119/
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
Signed-off-by: Chao Hao <chao.hao@mediatek.com>
Signed-off-by: Chun-Hung Wu <chun-hung.wu@mediatek.com>
Change-Id: Ic1f3a9cdf20f49f615f56bd9d9b0899a8f7255f6
---
 arch/arm64/configs/gki_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 3c3ad78c51db..658d4cd899e1 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -443,6 +443,7 @@ CONFIG_HWSPINLOCK=y
 CONFIG_MTK_TIMER=y
 CONFIG_MAILBOX=y
 CONFIG_IOMMU_LIMIT_IOVA_ALIGNMENT=y
+CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 CONFIG_REMOTEPROC=y
 CONFIG_RPMSG_CHAR=y
 CONFIG_DEVFREQ_GOV_PERFORMANCE=y