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

[platform/kernel/linux-exynos.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 cc30e49..2418bdf 100644 (file)
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -166,7 +166,7 @@ void __iomem *omap4_get_l2cache_base(void)
        return l2cache_base;
 }
 
-static void omap4_l2c310_write_sec(unsigned long val, unsigned reg)
+void omap4_l2c310_write_sec(unsigned long val, unsigned reg)
 {
        unsigned smc_op;
 
@@ -201,24 +201,10 @@ static void omap4_l2c310_write_sec(unsigned long val, unsigned reg)
 
 int __init omap_l2_cache_init(void)
 {
-       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 - 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, 0xcf9fffff);
-       else
-               l2x0_init(l2cache_base, aux_ctrl, 0xcf9fffff);
-
        return 0;
 }
 #endif