ARM: OMAP2: TI81XX: id: Add cpu id for TI816x ES2.0 and ES2.1

Currently omap3xxx_check_revision() detects ES1.0 and ES1.1 only,
this patch extends it by adding ES2.0 and ES2.1 versions support.

Signed-off-by: Aida Mynzhasova <aida.mynzhasova@skitlab.ru>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 74f71ab..9e5c7cb 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -407,11 +407,18 @@ void __init omap3xxx_check_revision(void)
                        cpu_rev = "1.0";
                        break;
                case 1:
-               /* FALLTHROUGH */
-               default:
                        omap_revision = TI8168_REV_ES1_1;
                        cpu_rev = "1.1";
                        break;
+               case 2:
+                       omap_revision = TI8168_REV_ES2_0;
+                       cpu_rev = "2.0";
+                       break;
+               case 3:
+                       /* FALLTHROUGH */
+               default:
+                       omap_revision = TI8168_REV_ES2_1;
+                       cpu_rev = "2.1";
                }
                break;
        case 0xb944:

diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 3cefc49..9cd9414 100644 (file)
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -403,6 +403,8 @@ IS_OMAP_TYPE(3430, 0x3430)
 #define TI816X_CLASS           0x81600034
 #define TI8168_REV_ES1_0       TI816X_CLASS
 #define TI8168_REV_ES1_1       (TI816X_CLASS | (0x1 << 8))
+#define TI8168_REV_ES2_0       (TI816X_CLASS | (0x2 << 8))
+#define TI8168_REV_ES2_1       (TI816X_CLASS | (0x3 << 8))
 
 #define TI814X_CLASS           0x81400034
 #define TI8148_REV_ES1_0       TI814X_CLASS