diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2017-02-25 21:40:22 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-02 14:03:43 +0100 |
| commit | 59cce42f38a89697f9fd3e04e66aa9c06a5ea093 (patch) | |
| tree | 06c42e70b862f8d83675ed768fd4ab93f6eaee80 /arch/arm/mach-mvebu | |
| parent | f8d4f622c93bdd2fa0ef89da90caed66525ae0dc (diff) | |
| download | barebox-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 'arch/arm/mach-mvebu')
| -rw-r--r-- | arch/arm/mach-mvebu/kirkwood.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c index d5ddf05e34..59fb95ff4a 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); |