diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-06 19:25:12 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-10 01:28:47 +0100 |
| commit | ab2a724a2ef9cee5957692257a5d1f08fd7acbbd (patch) | |
| tree | e1aaa55cd492547b08aecd84e98ddece32662242 /arch/arm/mach-integrator/integrator_ap.c | |
| parent | Merge tag 'omap-for-v3.9/fixes-non-critical-signed-v2' of git://git.kernel.or... (diff) | |
| download | linux-ab2a724a2ef9cee5957692257a5d1f08fd7acbbd.tar.xz linux-ab2a724a2ef9cee5957692257a5d1f08fd7acbbd.zip | |
ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU
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.
Cc: stable@vger.kernel.org
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 11e2a4145807..26762bf41308 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -613,7 +613,6 @@ static struct map_desc ap_io_desc_atag[] __initdata = { static void __init ap_map_io_atag(void) { iotable_init(ap_io_desc_atag, ARRAY_SIZE(ap_io_desc_atag)); - ap_syscon_base = __io_address(INTEGRATOR_SC_BASE); ap_map_io(); } @@ -685,6 +684,7 @@ static void __init ap_init(void) platform_device_register(&cfi_flash_device); + ap_syscon_base = __io_address(INTEGRATOR_SC_BASE); sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET); for (i = 0; i < 4; i++) { struct lm_device *lmdev; |