OMAP: ID: introduce chip detection for OMAP4460

[pandora-kernel.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 2537090..743889a 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -344,10 +344,10 @@ static void __init omap4_check_revision(void)
        rev = (idcode >> 28) & 0xf;
 
        /*
-        * Few initial ES2.0 samples IDCODE is same as ES1.0
+        * Few initial 4430 ES2.0 samples IDCODE is same as ES1.0
         * Use ARM register to detect the correct ES version
         */
-       if (!rev) {
+       if (!rev && (hawkeye != 0xb94e)) {
                idcode = read_cpuid(CPUID_ID);
                rev = (idcode & 0xf) - 1;
        }
@@ -377,6 +377,15 @@ static void __init omap4_check_revision(void)
                        omap_chip.oc |= CHIP_IS_OMAP4430ES2_2;
                }
                break;
+       case 0xb94e:
+               switch (rev) {
+               case 0:
+               default:
+                       omap_revision = OMAP4460_REV_ES1_0;
+                       omap_chip.oc |= CHIP_IS_OMAP4460ES1_0;
+                       break;
+               }
+               break;
        default:
                /* Unknown default to latest silicon rev as default */
                omap_revision = OMAP4430_REV_ES2_2;