commit a04c30414d8064c8a9d22596fca56fffd5f1c6fa
author Aneesh V <aneesh@ti.com> Mon Nov 21 23:39:03 2011 +0000
committer Albert ARIBAUD <albert.u.boot@aribaud.net> Tue Dec 06 23:59:34 2011 +0100
tree e114f1d220da0c02c8dcc0fa672f9a3fb5cded9f
parent 7d9fa57021a07d7d8f497b36877893ab030cc7b7

omap4460: add ES1.1 identification

Signed-off-by: Aneesh V <aneesh@ti.com>

arch/arm/cpu/armv7/omap4/hwinit.c

diff --git a/arch/arm/cpu/armv7/omap4/hwinit.c b/arch/arm/cpu/armv7/omap4/hwinit.c
index 52c9b19..cd1451a 100644
--- a/arch/arm/cpu/armv7/omap4/hwinit.c
+++ b/arch/arm/cpu/armv7/omap4/hwinit.c
@@ -146,7 +146,15 @@
 		*omap4_revision = OMAP4430_ES2_3;
 		break;
 	case MIDR_CORTEX_A9_R2P10:
-		*omap4_revision = OMAP4460_ES1_0;
+		switch (readl(CONTROL_ID_CODE)) {
+		case OMAP4460_CONTROL_ID_CODE_ES1_1:
+			*omap4_revision = OMAP4460_ES1_1;
+			break;
+		case OMAP4460_CONTROL_ID_CODE_ES1_0:
+		default:
+			*omap4_revision = OMAP4460_ES1_0;
+			break;
+		}
 		break;
 	default:
 		*omap4_revision = OMAP4430_SILICON_ID_INVALID;