From: Robin Murphy <Robin.Murphy@arm.com>
Date: Mon, 12 Jan 2015 20:48:54 +0000 (+0000)
Subject: arm64: implement generic IOMMU configuration
X-Git-Tag: v4.0-rc1~116^2~18
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=78d51e0b8b57728099a3da74f4a10b6f8c71b764;p=sfrench%2Fcifs-2.6.git

arm64: implement generic IOMMU configuration

Add the necessary call to of_iommu_init.

Acked-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index bb10903887d4..e8420f635bd4 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -40,6 +40,7 @@
 #include <linux/fs.h>
 #include <linux/proc_fs.h>
 #include <linux/memblock.h>
+#include <linux/of_iommu.h>
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 #include <linux/efi.h>
@@ -405,6 +406,7 @@ void __init setup_arch(char **cmdline_p)
 
 static int __init arm64_device_init(void)
 {
+	of_iommu_init();
 	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 	return 0;
 }