summaryrefslogtreecommitdiff
path: root/arch/arm64/kernel
diff options
context:
space:
mode:
authorRobin Murphy <Robin.Murphy@arm.com>2015-01-12 20:48:54 (GMT)
committerCatalin Marinas <catalin.marinas@arm.com>2015-01-23 16:44:16 (GMT)
commit78d51e0b8b57728099a3da74f4a10b6f8c71b764 (patch)
treeeb78230c54a3390bb64dc8c107f1b977d2f78f1e /arch/arm64/kernel
parent9d3bfbb4df58a8025b46b2676da2cf450385b754 (diff)
downloadlinux-78d51e0b8b57728099a3da74f4a10b6f8c71b764.tar.xz
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>
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r--arch/arm64/kernel/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index bb10903..e8420f6 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;
}