diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-08-27 18:51:16 +0200 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-12-01 17:50:50 +0100 |
| commit | af4dda732ea044517f8beed4a38c852ea97e7690 (patch) | |
| tree | 730f58541092c34b207a1b7bd0e4f036ee0f7ef7 /arch/arm/kernel | |
| parent | dma-mapping: detect and configure IOMMU in of_dma_configure (diff) | |
| download | linux-af4dda732ea044517f8beed4a38c852ea97e7690.tar.xz linux-af4dda732ea044517f8beed4a38c852ea97e7690.zip | |
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/kernel')
| -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 @@ #include <linux/bootmem.h> #include <linux/seq_file.h> #include <linux/screen_info.h> +#include <linux/of_iommu.h> #include <linux/of_platform.h> #include <linux/init.h> #include <linux/kexec.h> @@ -806,6 +807,7 @@ static int __init customize_machine(void) * machine from the device tree, if no callback is provided, * otherwise we would always need an init_machine callback. */ + of_iommu_init(); if (machine_desc->init_machine) machine_desc->init_machine(); #ifdef CONFIG_OF |