OMAP3630: Add ES1.1 and ES1.2 detection

Add revision detection for ES1.1 and ES1.2. Set default
revision as ES1.2.

Add CHIP_GE_OMAP3630ES1_1 to detect revisions 1.1 and later.
This is needed for at least one feature that is broken in
3630ES1.0 but exists on older (3430 ES3.1) and newer revisions.

Additionally, update some of the CHIP_GE_* macros to use other
macros for ease of maintenance.

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Nishanth Menon <nm@ti.com>
Cc: Manjunatha GK <manjugk@ti.com>
[tony@atomide.com: update to remove fallthrough handling]
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 25 insertions, 3 deletions

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index fd1904b013f..e8256a2ed8e 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -269,11 +269,27 @@ static void __init omap3_check_revision(void)
                 omap_chip.oc |= CHIP_IS_OMAP3430ES3_1;
                 break;
         case 0xb891:
-        /* FALLTHROUGH */
+                /* Handle 36xx devices */
+                omap_chip.oc |= CHIP_IS_OMAP3630ES1;
+
+                switch(rev) {
+                case 0: /* Take care of early samples */
+                        omap_revision = OMAP3630_REV_ES1_0;
+                        break;
+                case 1:
+                        omap_revision = OMAP3630_REV_ES1_1;
+                        omap_chip.oc |= CHIP_IS_OMAP3630ES1_1;
+                        break;
+                case 2:
+                default:
+                        omap_revision =  OMAP3630_REV_ES1_2;
+                        omap_chip.oc |= CHIP_IS_OMAP3630ES1_2;
+                        break;
+                }
         default:
                 /* Unknown default to latest silicon rev as default*/
-                omap_revision = OMAP3630_REV_ES1_0;
-                omap_chip.oc |= CHIP_IS_OMAP3630ES1;
+                omap_revision =  OMAP3630_REV_ES1_2;
+                omap_chip.oc |= CHIP_IS_OMAP3630ES1_2;
         }
 }
 
@@ -349,6 +365,12 @@ static void __init omap3_cpuinfo(void)
         case OMAP_REVBITS_00:
                 strcpy(cpu_rev, "1.0");
                 break;
+        case OMAP_REVBITS_01:
+                strcpy(cpu_rev, "1.1");
+                break;
+        case OMAP_REVBITS_02:
+                strcpy(cpu_rev, "1.2");
+                break;
         case OMAP_REVBITS_10:
                 strcpy(cpu_rev, "2.0");
                 break;