Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af4dda73 authored by Will Deacon's avatar Will Deacon
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 97890ba9

arch/arm/kernel/setup.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/bootmem.h>

#include <linux/bootmem.h>

#include <linux/seq_file.h>

#include <linux/seq_file.h>

#include <linux/screen_info.h>

#include <linux/screen_info.h>

#include <linux/of_iommu.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/kexec.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,

	 * machine from the device tree, if no callback is provided,

	 * otherwise we would always need an init_machine callback.

	 * otherwise we would always need an init_machine callback.

	 */

	 */

	of_iommu_init();

	if (machine_desc->init_machine)

	if (machine_desc->init_machine)

		machine_desc->init_machine();

		machine_desc->init_machine();

#ifdef CONFIG_OF

#ifdef CONFIG_OF