From 6b034b1bb55c446909811faa9a57c6567bbe91bb Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Thu, 16 Sep 2010 18:44:47 +0530
Subject: [PATCH] --- yaml --- r: 216883 b: refs/heads/master c:
 a777b7277ef9b04481d4ceaac353bb4bd82e2f1e h: refs/heads/master i:   216881:
 8e33f4573bc2942661c2a99031e2983531a36391   216879:
 5530edaf5fca6434f4426a01d49fe1f15e954266 v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/arm/mach-omap2/omap4-common.c | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 00412d9c5cae..568c2ebd20a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed6be0bafc7781634a197ddd85b575ffcd7736b6
+refs/heads/master: a777b7277ef9b04481d4ceaac353bb4bd82e2f1e
diff --git a/trunk/arch/arm/mach-omap2/omap4-common.c b/trunk/arch/arm/mach-omap2/omap4-common.c
index 13dc9794dcc2..923f9f5f91ce 100644
--- a/trunk/arch/arm/mach-omap2/omap4-common.c
+++ b/trunk/arch/arm/mach-omap2/omap4-common.c
@@ -61,10 +61,14 @@ static int __init omap_l2_cache_init(void)
 	omap_smc1(0x102, 0x1);
 
 	/*
-	 * 32KB way size, 16-way associativity,
-	 * parity disabled
+	 * 16-way associativity, parity disabled
+	 * Way size - 32KB (es1.0)
+	 * Way size - 64KB (es2.0 +)
 	 */
-	l2x0_init(l2cache_base, 0x0e050000, 0xc0000fff);
+	if (omap_rev() == OMAP4430_REV_ES1_0)
+		l2x0_init(l2cache_base, 0x0e050000, 0xc0000fff);
+	else
+		l2x0_init(l2cache_base, 0x0e070000, 0xc0000fff);
 
 	return 0;
 }