summaryrefslogtreecommitdiffstats
path: root/drivers/bus
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2017-02-25 21:40:22 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-03-02 14:03:43 +0100
commit59cce42f38a89697f9fd3e04e66aa9c06a5ea093 (patch)
tree06c42e70b862f8d83675ed768fd4ab93f6eaee80 /drivers/bus
parentf8d4f622c93bdd2fa0ef89da90caed66525ae0dc (diff)
downloadbarebox-59cce42f38a89697f9fd3e04e66aa9c06a5ea093.tar.gz
barebox-59cce42f38a89697f9fd3e04e66aa9c06a5ea093.tar.xz
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>
Diffstat (limited to 'drivers/bus')
-rw-r--r--drivers/bus/mvebu-mbus.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c
index fc940e3b54..965a221d3b 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);