From mboxrd@z Thu Jan 1 00:00:00 1970 From: tony@atomide.com (Tony Lindgren) Date: Fri, 28 Mar 2014 09:03:59 -0700 Subject: [PATCH 58/75] ARM: l2c: omap2: remove cache size override In-Reply-To: References: <20140328151249.GJ7528@n2100.arm.linux.org.uk> Message-ID: <20140328160358.GG24308@atomide.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org * Russell King [140328 08:22]: Missing description? > Signed-off-by: Russell King > --- > arch/arm/mach-omap2/omap4-common.c | 8 +++----- > 1 file changed, 3 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c > index ce2fad84a43c..c0f9a81a2d32 100644 > --- a/arch/arm/mach-omap2/omap4-common.c > +++ b/arch/arm/mach-omap2/omap4-common.c > @@ -212,20 +212,18 @@ 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_ASSOCIATIVITY_16 | > - L310_AUX_CTRL_CACHE_REPLACE_RR | > + aux_ctrl = L310_AUX_CTRL_CACHE_REPLACE_RR | > L310_AUX_CTRL_NS_LOCKDOWN | > L310_AUX_CTRL_NS_INT_CTRL | > - L2C_AUX_CTRL_WAY_SIZE(3) | > 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, 0xc19fffff); > else > - l2x0_init(l2cache_base, aux_ctrl, L2X0_AUX_CTRL_MASK); > + l2x0_init(l2cache_base, aux_ctrl, 0xc19fffff); > > return 0; > } > -- > 1.8.3.1 >