Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 226537
b: refs/heads/master
c: 1773e60
h: refs/heads/master
i:
  226535: 68beaa7
v: v3
  • Loading branch information
Santosh Shilimkar authored and Tony Lindgren committed Dec 18, 2010
1 parent 569dab8 commit ea9a739
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0aaa6f8f1da195ae1a993d3e9c80d600480cf947
refs/heads/master: 1773e60a816b28f4084810f96e9195aaaa7fb8c3
13 changes: 11 additions & 2 deletions trunk/arch/arm/mach-omap2/omap4-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ static void omap4_l2x0_disable(void)

static int __init omap_l2_cache_init(void)
{
u32 aux_ctrl = 0;

/*
* To avoid code running on other OMAPs in
* multi-omap builds
Expand All @@ -72,10 +74,17 @@ static int __init omap_l2_cache_init(void)
* Way size - 32KB (es1.0)
* Way size - 64KB (es2.0 +)
*/
aux_ctrl = ((1 << L2X0_AUX_CTRL_ASSOCIATIVITY_SHIFT) |
(0x1 << 25) |
(0x1 << L2X0_AUX_CTRL_NS_LOCKDOWN_SHIFT) |
(0x1 << L2X0_AUX_CTRL_NS_INT_CTRL_SHIFT));

if (omap_rev() == OMAP4430_REV_ES1_0)
l2x0_init(l2cache_base, 0x0e050000, 0xc0000fff);
aux_ctrl |= 0x2 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT;
else
l2x0_init(l2cache_base, 0x0e070000, 0xc0000fff);
aux_ctrl |= 0x3 << L2X0_AUX_CTRL_WAY_SIZE_SHIFT;

l2x0_init(l2cache_base, aux_ctrl, L2X0_AUX_CTRL_MASK);

/*
* Override default outer_cache.disable with a OMAP4
Expand Down

0 comments on commit ea9a739

Please sign in to comment.