ARM: l2c: omap2+: get rid of redundant cache replacement policy setting

L2 cache initialization for OMAP4 redundantly sets the cache policy to
Round-Robin. This is not needed since thats the PL310 default anyway.

Removing this reduces the number of platform specific aux control
settings.

Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index df3f53195c57d42e46f1a7c2af650e510b2a9579..6927d5b120fe3e4f3f0268691cd38129d3c563fe 100644 (file)
--- a/arch/arm/mach-omap2/omap4-common.c
+++ b/arch/arm/mach-omap2/omap4-common.c
@@ -213,16 +213,15 @@ static int __init omap_l2_cache_init(void)
                return -ENOMEM;
 
        /* 16-way associativity, parity disabled, way size - 64KB (es2.0 +) */
-       aux_ctrl = L310_AUX_CTRL_CACHE_REPLACE_RR |
-                  L2C_AUX_CTRL_SHARED_OVERRIDE |
+       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, 0xcd9fffff);
+               l2x0_of_init(aux_ctrl, 0xcf9fffff);
        else
-               l2x0_init(l2cache_base, aux_ctrl, 0xcd9fffff);
+               l2x0_init(l2cache_base, aux_ctrl, 0xcf9fffff);
 
        return 0;
 }