ARM: l2c: omap2: avoid reading directly from the L2 registers in platform code

Avoid reading directly from the L2 registers in platform code.  The L2
code will have already saved the register values itself into the
l2x0_saved_regs structure, so platform code should just move these
values to where they're required.

This is safe because the L2x0 will have been initialised by an early
initcall, whereas the OMAP4 PM code is initialised late.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
index ba43f49fbb59b27846919798becc4b4427657a77..61cb77f8cf12deb1b9fd4486755908d3cbe9f39f 100644 (file)
--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
@@ -187,19 +187,15 @@ static void l2x0_pwrst_prepare(unsigned int cpu_id, unsigned int save_state)
  * in every restore MPUSS OFF path.
  */
 #ifdef CONFIG_CACHE_L2X0
-static void save_l2x0_context(void)
+static void __init save_l2x0_context(void)
 {
-       u32 val;
-       void __iomem *l2x0_base = omap4_get_l2cache_base();
-       if (l2x0_base) {
-               val = __raw_readl(l2x0_base + L2X0_AUX_CTRL);
-               __raw_writel(val, sar_base + L2X0_AUXCTRL_OFFSET);
-               val = __raw_readl(l2x0_base + L310_PREFETCH_CTRL);
-               __raw_writel(val, sar_base + L2X0_PREFETCH_CTRL_OFFSET);
-       }
+       __raw_writel(l2x0_saved_regs.aux_ctrl,
+                    sar_base + L2X0_AUXCTRL_OFFSET);
+       __raw_writel(l2x0_saved_regs.prefetch_ctrl,
+                    sar_base + L2X0_PREFETCH_CTRL_OFFSET);
 }
 #else
-static void save_l2x0_context(void)
+static void __init save_l2x0_context(void)
 {}
 #endif