ARM: OMAP2+: AM43x: Add ID for ES1.1

Adding ID for AM437x ES1.1 silicon.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 9428c5f9d4f2faa47e91a2caa193ecf39bba39fb..8a05eaf85f8a673f4883d8cb4ee783e0354e4070 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -465,8 +465,18 @@ void __init omap3xxx_check_revision(void)
                }
                break;
        case 0xb98c:
-               omap_revision = AM437X_REV_ES1_0;
-               cpu_rev = "1.0";
+               switch (rev) {
+               case 0:
+                       omap_revision = AM437X_REV_ES1_0;
+                       cpu_rev = "1.0";
+                       break;
+               case 1:
+               /* FALLTHROUGH */
+               default:
+                       omap_revision = AM437X_REV_ES1_1;
+                       cpu_rev = "1.1";
+                       break;
+               }
                break;
        case 0xb8f2:
                switch (rev) {

diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 076bd90a6ce0aca8d30914432c293dee1dbb071d..30abcc8b20e007eb878c8d10519ba2759f17d21c 100644 (file)
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -438,7 +438,8 @@ IS_OMAP_TYPE(3430, 0x3430)
 #define AM335X_REV_ES2_1       (AM335X_CLASS | (0x2 << 8))
 
 #define AM437X_CLASS           0x43700000
-#define AM437X_REV_ES1_0       AM437X_CLASS
+#define AM437X_REV_ES1_0       (AM437X_CLASS | (0x10 << 8))
+#define AM437X_REV_ES1_1       (AM437X_CLASS | (0x11 << 8))
 
 #define OMAP443X_CLASS         0x44300044
 #define OMAP4430_REV_ES1_0     (OMAP443X_CLASS | (0x10 << 8))