Similar to the previous commit, 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-koe...@pengutronix.de>
---
arch/arm/mach-mvebu/dove.c | 13 ++-----------
drivers/bus/mvebu-mbus.c | 9 +++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/arch/arm/mach-mvebu/dove.c b/arch/arm/mach-mvebu/dove.c
index 9a3b05d004d5..1cdb7e1b8296 100644
--- a/arch/arm/mach-mvebu/dove.c
+++ b/arch/arm/mach-mvebu/dove.c
@@ -52,7 +52,7 @@ static void __noreturn dove_restart_soc(struct
restart_handler *rst)
hang();
}
-static int dove_init_soc(struct device_node *root, void *context)
+static int dove_init_soc(void)
{
if (!of_machine_is_compatible("marvell,dove"))
return 0;
@@ -67,13 +67,4 @@ static int dove_init_soc(struct device_node *root, void
*context)
return 0;
}
-
-static int dove_register_soc_fixup(void)
-{
- mvebu_mbus_add_range("marvell,dove", 0xf0, 0x01,
- MVEBU_REMAP_INT_REG_BASE);
- mvebu_mbus_add_range("marvell,dove", 0xf0, 0x02,
- DOVE_REMAP_MC_REGS);
- return of_register_fixup(dove_init_soc, NULL);
-}
-pure_initcall(dove_register_soc_fixup);
+postcore_initcall(dove_init_soc);
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index b95c071d57a4..fc940e3b541d 100644
--- a/drivers/bus/mvebu-mbus.c
+++ b/drivers/bus/mvebu-mbus.c
@@ -811,6 +811,8 @@ static int mvebu_mbus_of_fixup(struct device_node *root,
void *context)
return 0;
}
+#define DOVE_REMAP_MC_REGS 0xf1800000
+
static int mvebu_mbus_fixup_register(void)
{
if (IS_ENABLED(CONFIG_ARCH_ARMADA_370) ||
@@ -818,6 +820,13 @@ static int mvebu_mbus_fixup_register(void)
mvebu_mbus_add_range("marvell,armada-370-xp", 0xf0, 0x01,
MVEBU_REMAP_INT_REG_BASE);
+ if (IS_ENABLED(CONFIG_ARCH_DOVE)) {
+ mvebu_mbus_add_range("marvell,dove", 0xf0, 0x01,
+ MVEBU_REMAP_INT_REG_BASE);
+ mvebu_mbus_add_range("marvell,dove", 0xf0, 0x02,
+ DOVE_REMAP_MC_REGS);
+ }
+
return of_register_fixup(mvebu_mbus_of_fixup, NULL);
}
pure_initcall(mvebu_mbus_fixup_register);
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
