summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorSekhar Nori2014-04-22 10:28:02 +0200
committerRussell King2014-05-30 01:49:47 +0200
commitd196483dfce233da7d6094371e694eadd7e4cc1b (patch)
treec0b69ee5d14c494a86a5fcd3469c0918eab3f9d3 /arch/arm/mach-omap2
parentARM: l2c: omap2: avoid reading directly from the L2 registers in platform code (diff)
downloadkernel-qcow2-linux-d196483dfce233da7d6094371e694eadd7e4cc1b.tar.gz
kernel-qcow2-linux-d196483dfce233da7d6094371e694eadd7e4cc1b.tar.xz
kernel-qcow2-linux-d196483dfce233da7d6094371e694eadd7e4cc1b.zip
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>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/omap4-common.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c
index df3f53195c57..6927d5b120fe 100644
--- 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;
}