iommu/rockchip: enable upstream iommu on ARM64 platform

Change-Id: I8470750d63b890322d48bc47c07c516f2e3ba270
Signed-off-by: Simon <xxm@rock-chips.com>

diff --git a/arch/arm64/configs/rockchip_cros_defconfig b/arch/arm64/configs/rockchip_cros_defconfig
index 8cf4080deb3f6c4b44fadd0d88f1c7801b0c25f4..6010ca9cd281a231fe6f33409ee670e85b2e42f1 100644 (file)
--- a/arch/arm64/configs/rockchip_cros_defconfig
+++ b/arch/arm64/configs/rockchip_cros_defconfig
@@ -517,6 +517,7 @@ CONFIG_ION_ROCKCHIP=y
 CONFIG_COMMON_CLK_RK808=y
 # CONFIG_COMMON_CLK_XGENE is not set
 CONFIG_MAILBOX=y
+CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_RK_IOMMU=y
 CONFIG_RK_IOVMM=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y

diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig
index 1d9e12f0a749d1ce4a110312cddb28ecce7c4ca9..400a58f71ac004dfe50cb7decdc3c4f2b72ec0e6 100755 (executable)
--- a/arch/arm64/configs/rockchip_defconfig
+++ b/arch/arm64/configs/rockchip_defconfig
@@ -515,6 +515,7 @@ CONFIG_ION_ROCKCHIP=y
 CONFIG_COMMON_CLK_RK808=y
 # CONFIG_COMMON_CLK_XGENE is not set
 CONFIG_MAILBOX=y
+CONFIG_ROCKCHIP_IOMMU=y
 CONFIG_RK_IOMMU=y
 CONFIG_RK_IOVMM=y
 CONFIG_ROCKCHIP_PM_DOMAINS=y