From 795c60fff585f20c18c7c4b417c7b58ecc1dc1d1 Mon Sep 17 00:00:00 2001
From: AnilKumar Ch <anilkumar@ti.com>
Date: Fri, 1 Feb 2013 15:58:22 +0530
Subject: [PATCH] --- yaml --- r: 359817 b: refs/heads/master c:
 5af044f472501c8e9bd6bb274fb3d71d07a038cd h: refs/heads/master i:   359815:
 d4c5aa1b361196ccdac619076d95f2c2737d112e v: v3

---
 [refs]                          |  2 +-
 trunk/arch/arm/mach-omap2/id.c  | 14 ++++++++++++--
 trunk/arch/arm/mach-omap2/soc.h |  1 +
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1b8e00bc01b0..7515e82c82fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f0de0d62f29e47f5142737dad7561f108f69e92
+refs/heads/master: 5af044f472501c8e9bd6bb274fb3d71d07a038cd
diff --git a/trunk/arch/arm/mach-omap2/id.c b/trunk/arch/arm/mach-omap2/id.c
index 45cc7ed4dd58..8a68f1ec66b9 100644
--- a/trunk/arch/arm/mach-omap2/id.c
+++ b/trunk/arch/arm/mach-omap2/id.c
@@ -399,8 +399,18 @@ void __init omap3xxx_check_revision(void)
 		}
 		break;
 	case 0xb944:
-		omap_revision = AM335X_REV_ES1_0;
-		cpu_rev = "1.0";
+		switch (rev) {
+		case 0:
+			omap_revision = AM335X_REV_ES1_0;
+			cpu_rev = "1.0";
+			break;
+		case 1:
+		/* FALLTHROUGH */
+		default:
+			omap_revision = AM335X_REV_ES2_0;
+			cpu_rev = "2.0";
+			break;
+		}
 		break;
 	case 0xb8f2:
 		switch (rev) {
diff --git a/trunk/arch/arm/mach-omap2/soc.h b/trunk/arch/arm/mach-omap2/soc.h
index f31d90774de0..15e959111e23 100644
--- a/trunk/arch/arm/mach-omap2/soc.h
+++ b/trunk/arch/arm/mach-omap2/soc.h
@@ -387,6 +387,7 @@ IS_OMAP_TYPE(3430, 0x3430)
 
 #define AM335X_CLASS		0x33500033
 #define AM335X_REV_ES1_0	AM335X_CLASS
+#define AM335X_REV_ES2_0	(AM335X_CLASS | (0x1 << 8))
 
 #define OMAP443X_CLASS		0x44300044
 #define OMAP4430_REV_ES1_0	(OMAP443X_CLASS | (0x10 << 8))