asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: l2c: omap2: implement new write_sec method

Browse source 
With the write_sec method, we no longer need to override the default
L2C disable method, and we no longer need the L2C set_debug method.
Both of these can be handled via the write_sec method.

Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2014-03-16 17:45:56 +00:00
parent 8523f61537
commit 36827edd2e
1 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
arch/arm/mach-omap2/omap4-common.c
View file

@ -167,17 +167,33 @@ void __iomem *omap4_get_l2cache_base(void)
return l2cache_base; return l2cache_base;
} }
static void omap4_l2x0_disable(void) static void omap4_l2c310_write_sec(unsigned long val, unsigned reg)
{ {
outer_flush_all(); unsigned smc_op;
/* Disable PL310 L2 Cache controller */
omap_smc1(0x102, 0x0);
}
static void omap4_l2x0_set_debug(unsigned long val) switch (reg) {
{ case L2X0_CTRL:
/* Program PL310 L2 Cache controller debug register */ smc_op = OMAP4_MON_L2X0_CTRL_INDEX;
omap_smc1(0x100, val); 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) static int __init omap_l2_cache_init(void)
@ -211,18 +227,12 @@ static int __init omap_l2_cache_init(void)
/* Enable PL310 L2 Cache controller */ /* Enable PL310 L2 Cache controller */
omap_smc1(0x102, 0x1); omap_smc1(0x102, 0x1);
outer_cache.write_sec = omap4_l2c310_write_sec;
if (of_have_populated_dt()) if (of_have_populated_dt())
l2x0_of_init(aux_ctrl, L2X0_AUX_CTRL_MASK); l2x0_of_init(aux_ctrl, L2X0_AUX_CTRL_MASK);
else else
l2x0_init(l2cache_base, aux_ctrl, L2X0_AUX_CTRL_MASK); 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;
return 0; return 0;
} }
omap_early_initcall(omap_l2_cache_init); omap_early_initcall(omap_l2_cache_init);