Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[sfrench/cifs-2.6.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index fd1904b013fa5fb9ea5cc3870b9f3da6d3840b8e..e8256a2ed8e782dd56a7bfa674b98886a9f63e71 100644 (file)
--- 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;