Merge branch 'for-2.6.30' into for-2.6.31

[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 b52a02f..34b5914 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -217,8 +217,13 @@ void __init omap2_check_revision(void)
                omap_chip.oc = CHIP_IS_OMAP3430;
                if (omap_rev() == OMAP3430_REV_ES1_0)
                        omap_chip.oc |= CHIP_IS_OMAP3430ES1;
-               else if (omap_rev() > OMAP3430_REV_ES1_0)
+               else if (omap_rev() >= OMAP3430_REV_ES2_0 &&
+                        omap_rev() <= OMAP3430_REV_ES2_1)
                        omap_chip.oc |= CHIP_IS_OMAP3430ES2;
+               else if (omap_rev() == OMAP3430_REV_ES3_0)
+                       omap_chip.oc |= CHIP_IS_OMAP3430ES3_0;
+               else if (omap_rev() == OMAP3430_REV_ES3_1)
+                       omap_chip.oc |= CHIP_IS_OMAP3430ES3_1;
        } else {
                pr_err("Uninitialized omap_chip, please fix!\n");
        }