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 <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Acked-by: Marek Szyprowski <[email protected]> Signed-off-by: Will Deacon <[email protected]>
lucaceresoli · Dec 1, 2014 · af4dda7 · af4dda7
1 parent 97890ba
commit af4dda7
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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