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

Commit Message

Aida Mynzhasova May 30, 2013, 10:21 a.m. UTC

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 <[e-mail]>
---
 arch/arm/mach-omap2/id.c  |   11 +++++++++--
 arch/arm/mach-omap2/soc.h |    2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

Comments

Tony Lindgren June 18, 2013, 8:18 a.m. UTC | #1

* Aida Mynzhasova <[e-mail]> [130530 03:26]:
> Currently omap3xxx_check_revision() detects ES1.0 and ES1.1 only,
> this patch extends it by adding ES2.0 and ES2.1 versions support.

Thanks applying into omap-for-v3.11/soc.

Regards,

Tony

Patch

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 1272c41..8b762a3 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -405,11 +405,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 197cc16..8e00226 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -383,6 +383,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