Merge branch 'omap-fixes'

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index b52a02fc7cd6356abe1c3bd08ba17dc632d8fa18..32ceaa6582408e36e96ba968e0cbe116d15a220f 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -45,6 +45,28 @@ int omap_chip_is(struct omap_chip_id oci)
 }
 EXPORT_SYMBOL(omap_chip_is);
 
+int omap_type(void)
+{
+       u32 val = 0;
+
+       if (cpu_is_omap24xx()) {
+               val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
+       } else if (cpu_is_omap34xx()) {
+               val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
+       } else {
+               pr_err("Cannot detect omap type!\n");
+               goto out;
+       }
+
+       val &= OMAP2_DEVICETYPE_MASK;
+       val >>= 8;
+
+out:
+       return val;
+}
+EXPORT_SYMBOL(omap_type);
+
+
 /*----------------------------------------------------------------------------*/
 
 #define OMAP_TAP_IDCODE                0x0204
@@ -217,8 +239,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");
        }