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

Commit 0ea2b538 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: EMEV2 map_io update 



Update the EMEV2 struct map_desc to exclude the SMU
and also include the ->map_io() callback in the DT
version of EMEV2 board support.

The EMEV2 SMP code can these days perform ioremap()
early on without the SMU information in the io_desc[].

To correctly support SMP in case of DT-only board
support then the ->map_io() callback is needed.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent 683101a6

arch/arm/mach-shmobile/setup-emev2.c

+1 −7
Original line number Diff line number Diff line
@@ -38,13 +38,6 @@ 


static struct map_desc emev2_io_desc[] __initdata = {

#ifdef CONFIG_SMP

	/* 128K entity map for 0xe0100000 (SMU) */

	{

		.virtual	= 0xe0100000,

		.pfn		= __phys_to_pfn(0xe0100000),

		.length		= SZ_128K,

		.type		= MT_DEVICE

	},

	/* 2M mapping for SCU + L2 controller */

	{

		.virtual	= 0xf0000000,
@@ -211,6 +204,7 @@ static const char *emev2_boards_compat_dt[] __initdata = { 


DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")

	.smp		= smp_ops(emev2_smp_ops),

	.map_io		= emev2_map_io,

	.init_early	= emev2_init_delay,

	.dt_compat	= emev2_boards_compat_dt,

MACHINE_END