arm64: implement generic IOMMU configuration
authorRobin Murphy <Robin.Murphy@arm.com>
Mon, 12 Jan 2015 20:48:54 +0000 (20:48 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Fri, 23 Jan 2015 16:44:16 +0000 (16:44 +0000)
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>
arch/arm64/kernel/setup.c

index bb10903887d43989b14da30c44b6908f595e94ad..e8420f635bd44711f968fef5ad8aaadc220cc511 100644 (file)
@@ -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;
 }