Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next

[sfrench/cifs-2.6.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 99b0154493a4c735e6a59393fc034a45d737ecaf..326cd982a3cb967146281e6fbf3fe82de3e35134 100644 (file)
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -167,75 +167,57 @@ void __iomem *omap4_get_l2cache_base(void)
        return l2cache_base;
 }
 
-static void omap4_l2x0_disable(void)
+static void omap4_l2c310_write_sec(unsigned long val, unsigned reg)
 {
-       outer_flush_all();
-       /* Disable PL310 L2 Cache controller */
-       omap_smc1(0x102, 0x0);
-}
+       unsigned smc_op;
 
-static void omap4_l2x0_set_debug(unsigned long val)
-{
-       /* Program PL310 L2 Cache controller debug register */
-       omap_smc1(0x100, val);
+       switch (reg) {
+       case L2X0_CTRL:
+               smc_op = OMAP4_MON_L2X0_CTRL_INDEX;
+               break;
+
+       case L2X0_AUX_CTRL:
+               smc_op = OMAP4_MON_L2X0_AUXCTRL_INDEX;
+               break;
+
+       case L2X0_DEBUG_CTRL:
+               smc_op = OMAP4_MON_L2X0_DBG_CTRL_INDEX;
+               break;
+
+       case L310_PREFETCH_CTRL:
+               smc_op = OMAP4_MON_L2X0_PREFETCH_INDEX;
+               break;
+
+       default:
+               WARN_ONCE(1, "OMAP L2C310: ignoring write to reg 0x%x\n", reg);
+               return;
+       }
+
+       omap_smc1(smc_op, val);
 }
 
-static int __init omap_l2_cache_init(void)
+int __init omap_l2_cache_init(void)
 {
-       u32 aux_ctrl = 0;
-
-       /*
-        * To avoid code running on other OMAPs in
-        * multi-omap builds
-        */
-       if (!cpu_is_omap44xx())
-               return -ENODEV;
+       u32 aux_ctrl;
 
        /* Static mapping, never released */
        l2cache_base = ioremap(OMAP44XX_L2CACHE_BASE, SZ_4K);
        if (WARN_ON(!l2cache_base))
                return -ENOMEM;
 
-       /*
-        * 16-way associativity, parity disabled
-        * 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) {
-               aux_ctrl |= 0x2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT;
-       } else {
-               aux_ctrl |= ((0x3 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT) |
-                       (1 << L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT) |
-                       (1 << L2X0_AUX_CTRL_DATA_PREFETCH_SHIFT) |
-                       (1 << L2X0_AUX_CTRL_INSTR_PREFETCH_SHIFT) |
-                       (1 << L2X0_AUX_CTRL_EARLY_BRESP_SHIFT));
-       }
-       if (omap_rev() != OMAP4430_REV_ES1_0)
-               omap_smc1(0x109, aux_ctrl);
-
-       /* Enable PL310 L2 Cache controller */
-       omap_smc1(0x102, 0x1);
+       /* 16-way associativity, parity disabled, way size - 64KB (es2.0 +) */
+       aux_ctrl = L2C_AUX_CTRL_SHARED_OVERRIDE |
+                  L310_AUX_CTRL_DATA_PREFETCH |
+                  L310_AUX_CTRL_INSTR_PREFETCH;
 
+       outer_cache.write_sec = omap4_l2c310_write_sec;
        if (of_have_populated_dt())
-               l2x0_of_init(aux_ctrl, L2X0_AUX_CTRL_MASK);
+               l2x0_of_init(aux_ctrl, 0xcf9fffff);
        else
-               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;
-       outer_cache.set_debug = omap4_l2x0_set_debug;
+               l2x0_init(l2cache_base, aux_ctrl, 0xcf9fffff);
 
        return 0;
 }
-omap_early_initcall(omap_l2_cache_init);
 #endif
 
 void __iomem *omap4_get_sar_ram_base(void)