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@xxxxxxxxxxxxxx>
---
arch/arm/mach-mvebu/kirkwood.c | 11 ++---------
drivers/bus/mvebu-mbus.c | 4 ++++
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
index d5ddf05e3447..59fb95ff4adf 100644
--- a/arch/arm/mach-mvebu/kirkwood.c
+++ b/arch/arm/mach-mvebu/kirkwood.c
@@ -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);
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index fc940e3b541d..965a221d3ba4 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -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);
--
2.11.0
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
