omap4: l2x0: Construct the AUXCTRL value using defines

[pandora-kernel.git] / arch / arm / mach-omap2 / omap4-common.c

diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index 923f9f5..c814604 100644 (file)
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -44,8 +44,17 @@ void __init gic_init_irq(void)
 }
 
 #ifdef CONFIG_CACHE_L2X0
+
+static void omap4_l2x0_disable(void)
+{
+       /* Disable PL310 L2 Cache controller */
+       omap_smc1(0x102, 0x0);
+}
+
 static int __init omap_l2_cache_init(void)
 {
+       u32 aux_ctrl = 0;
+
        /*
         * To avoid code running on other OMAPs in
         * multi-omap builds
@@ -65,10 +74,23 @@ static int __init omap_l2_cache_init(void)
         * Way size - 32KB (es1.0)
         * Way size - 64KB (es2.0 +)
         */
+       aux_ctrl = ((1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT) |
+                       (0x1 << 25) |
+                       (0x1 << L2X0_AUX_CTRL_NS_LOCKDOWN_SHIFT) |
+                       (0x1 << L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT));
+
        if (omap_rev() == OMAP4430_REV_ES1_0)
-               l2x0_init(l2cache_base, 0x0e050000, 0xc0000fff);
+               aux_ctrl |= 0x2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT;
        else
-               l2x0_init(l2cache_base, 0x0e070000, 0xc0000fff);
+               aux_ctrl |= 0x3 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT;
+
+       l2x0_init(l2cache_base, aux_ctrl, L2X0_AUX_CTRL_MASK);
+
+       /*
+        * Override default outer_cache.disable with a OMAP4
+        * specific one
+       */
+       outer_cache.disable = omap4_l2x0_disable;
 
        return 0;
 }