Message ID | 20130206182512.GB28640@mudshark.cambridge.arm.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Wed, Feb 06, 2013 at 06:25:12PM +0000, Will Deacon wrote: > On Mon, Feb 04, 2013 at 09:49:44PM +0000, Arnd Bergmann wrote: > > On Sunday 03 February 2013, Will Deacon wrote: > > > I think it's been broken for a little while as it only affects !MMU > > > configurations, which aren't especially popular. My guess is that > > > 83feba511e5d ("ARM: integrator: remove static AP syscon mapping") is what > > > caused the breakage. > > > > > > The fix should apply against mainline. > > > > Sounds like a candidate for stable as well then. I'm not sure if anyone > > cares about !MMU stable kernels, but it's totally possible with the > > LTSI kernels. > > Agreed. I've lost where we've got to, so here's the patch against -rc5 with > the CC stable and Linus' ack. Applied to fixes-non-critical for 3.9. -Olof
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 11e2a41..26762bf 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;