Commit 9165cb49 authored by Will Deacon's avatar Will Deacon Committed by Greg Kroah-Hartman

ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU

commit ab2a724a upstream.

When running on Integrator/AP using atags, ap_syscon_base is initialised
in ->map_io, which isn't called for !MMU platforms.

Instead, initialise the pointer in ->machine_init, as we do when booting
with device-tree.
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4622b3b7
...@@ -613,7 +613,6 @@ static struct map_desc ap_io_desc_atag[] __initdata = { ...@@ -613,7 +613,6 @@ static struct map_desc ap_io_desc_atag[] __initdata = {
static void __init ap_map_io_atag(void) static void __init ap_map_io_atag(void)
{ {
iotable_init(ap_io_desc_atag, ARRAY_SIZE(ap_io_desc_atag)); iotable_init(ap_io_desc_atag, ARRAY_SIZE(ap_io_desc_atag));
ap_syscon_base = __io_address(INTEGRATOR_SC_BASE);
ap_map_io(); ap_map_io();
} }
...@@ -685,6 +684,7 @@ static void __init ap_init(void) ...@@ -685,6 +684,7 @@ static void __init ap_init(void)
platform_device_register(&cfi_flash_device); platform_device_register(&cfi_flash_device);
ap_syscon_base = __io_address(INTEGRATOR_SC_BASE);
sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET); sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET);
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
struct lm_device *lmdev; struct lm_device *lmdev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment