sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

mvebu: kirkwood: simplify soc init code flow 

Similar to the two previous commits, this gets rid of a of-fixup which
is strange because the soc init stuff is rerun then when a new dt for
booting into Linux is loaded.

The initcall must be postponed to post-core to ensure
of_machine_is_compatible is working correctly.

The call to mvebu_mbus_add_range is moved to drivers/bus/mvebu-mbus.c to
ensure it's registered early enough.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2017-02-25 21:40:22 +01:00 committed by Sascha Hauer
parent f8d4f622c9
commit 59cce42f38
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-mvebu/kirkwood.c
View File

@ -29,7 +29,7 @@ static void __noreturn kirkwood_restart_soc(struct restart_handler *rst)
hang();
}
static int kirkwood_init_soc(struct device_node *root, void *context)
static int kirkwood_init_soc(void)
{
if (!of_machine_is_compatible("marvell,kirkwood"))
return 0;
@ -43,11 +43,4 @@ static int kirkwood_init_soc(struct device_node *root, void *context)
return 0;
}
static int kirkwood_register_soc_fixup(void)
{
mvebu_mbus_add_range("marvell,kirkwood", 0xf0, 0x01,
MVEBU_REMAP_INT_REG_BASE);
return of_register_fixup(kirkwood_init_soc, NULL);
}
pure_initcall(kirkwood_register_soc_fixup);
postcore_initcall(kirkwood_init_soc);

4
drivers/bus/mvebu-mbus.c
View File

@ -827,6 +827,10 @@ static int mvebu_mbus_fixup_register(void)
DOVE_REMAP_MC_REGS);
}
if (IS_ENABLED(CONFIG_ARCH_KIRKWOOD))
mvebu_mbus_add_range("marvell,kirkwood", 0xf0, 0x01,
MVEBU_REMAP_INT_REG_BASE);
return of_register_fixup(mvebu_mbus_of_fixup, NULL);
}
pure_initcall(mvebu_mbus_fixup_register);