OSDN Git Service

ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU
authorWill Deacon <will.deacon@arm.com>
Wed, 6 Feb 2013 18:25:12 +0000 (18:25 +0000)
committerOlof Johansson <olof@lixom.net>
Sun, 10 Feb 2013 00:28:47 +0000 (16:28 -0800)
commitab2a724a2ef9cee5957692257a5d1f08fd7acbbd
treee1aaa55cd492547b08aecd84e98ddece32662242
parentc1226ff9af84dfa6ef73d95435748569c99b5171
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>
arch/arm/mach-integrator/integrator_ap.c