[ARM] OMAP3: update ES level flags to discriminate between post-ES2 revisions

Some OMAP3 chip behaviors change in ES levels after ES2.  Modify the
existing omap_chip flags to add options for ES3.0 and ES3.1.

Add a new macro, CHIP_GE_OMAP3430ES2, to cover ES levels from ES2
onwards - a common pattern for OMAP3 features.  Update all current
users of the omap_chip macros to use this new macro.

Also add CHIP_GE_OMAP3430ES3_1 to cover the USBTLL SAR errata case
(described and fixed in the following patch)

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 6 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index b52a02fc7cd6..34b5914e0f8b 100644
--- 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");
         }