diff options
author | Will Deacon <will.deacon@arm.com> | 2014-08-27 12:51:16 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2014-12-01 11:50:50 -0500 |
commit | af4dda732ea044517f8beed4a38c852ea97e7690 (patch) | |
tree | 730f58541092c34b207a1b7bd0e4f036ee0f7ef7 /arch/arm | |
parent | 97890ba9289c66e23f2f2d431937693b6498d6f6 (diff) |
arm: call iommu_init before of_platform_populate
We need to ensure that the IOMMUs in the system have a chance to perform
some basic initialisation before we start adding masters to them.
This patch adds a call to of_iommu_init before of_platform_populate.
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index c03106378b49..1cfc94aa7fa2 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <linux/bootmem.h> | 18 | #include <linux/bootmem.h> |
19 | #include <linux/seq_file.h> | 19 | #include <linux/seq_file.h> |
20 | #include <linux/screen_info.h> | 20 | #include <linux/screen_info.h> |
21 | #include <linux/of_iommu.h> | ||
21 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
22 | #include <linux/init.h> | 23 | #include <linux/init.h> |
23 | #include <linux/kexec.h> | 24 | #include <linux/kexec.h> |
@@ -806,6 +807,7 @@ static int __init customize_machine(void) | |||
806 | * machine from the device tree, if no callback is provided, | 807 | * machine from the device tree, if no callback is provided, |
807 | * otherwise we would always need an init_machine callback. | 808 | * otherwise we would always need an init_machine callback. |
808 | */ | 809 | */ |
810 | of_iommu_init(); | ||
809 | if (machine_desc->init_machine) | 811 | if (machine_desc->init_machine) |
810 | machine_desc->init_machine(); | 812 | machine_desc->init_machine(); |
811 | #ifdef CONFIG_OF | 813 | #ifdef CONFIG_OF |