diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2017-02-25 21:40:21 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-02 14:03:43 +0100 |
| commit | f8d4f622c93bdd2fa0ef89da90caed66525ae0dc (patch) | |
| tree | 22c790e6762853499fd34b1e1b913e6d6f7a2742 /arch/arm/mach-mvebu | |
| parent | 8a5edc9e99f0326b855f7b07d35f320b58bbdcb3 (diff) | |
| download | barebox-f8d4f622c93bdd2fa0ef89da90caed66525ae0dc.tar.gz barebox-f8d4f622c93bdd2fa0ef89da90caed66525ae0dc.tar.xz | |
mvebu: dove: simplify soc init code flow
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-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/dove.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/mach-mvebu/dove.c b/arch/arm/mach-mvebu/dove.c index 9a3b05d004..1cdb7e1b82 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); |