ARMV7: OMAP3: Add 37xx ESx revision numbers.

OMAP3: Add 37xx ESx revision numbers.

Signed-off-by: Michael Jones <michael.jones@matrix-vision.de>
Signed-off-by: Howard D. Gray <howard.gray@matrix-vision.de>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>

diff --git a/arch/arm/cpu/armv7/omap3/sys_info.c b/arch/arm/cpu/armv7/omap3/sys_info.c
index 8d0496cb6c03ef2b7f0d0de717837a9f21657a16..bdb151d7f63904b1f0be6cb138cf5de3c1eae09b 100644 (file)
--- a/arch/arm/cpu/armv7/omap3/sys_info.c
+++ b/arch/arm/cpu/armv7/omap3/sys_info.c
@@ -46,6 +46,12 @@ static char *rev_s[CPU_3XX_MAX_REV] = {
                                "3.1.2"};
 #endif /* CONFIG_DISPLAY_CPUINFO */
 
+/* this is the revision table for 37xx CPUs */
+static char *rev_s_37xx[CPU_37XX_MAX_REV] = {
+                               "1.0",
+                               "1.1",
+                               "1.2"};
+
 /*****************************************************************
  * dieid_num_r(void) - read and set die ID
  *****************************************************************/
@@ -347,7 +353,12 @@ int print_cpuinfo (void)
                sec_s = "?";
        }
 
-       printf("%s%s-%s ES%s, CPU-OPP2, L3-165MHz, Max CPU Clock %s\n",
+       if (CPU_OMAP36XX == get_cpu_family())
+               printf("%s%s-%s ES%s, CPU-OPP2, L3-165MHz, Max CPU Clock %s\n",
+                       cpu_family_s, cpu_s, sec_s,
+                       rev_s_37xx[get_cpu_rev()], max_clk);
+       else
+               printf("%s%s-%s ES%s, CPU-OPP2, L3-165MHz, Max CPU Clock %s\n",
                        cpu_family_s, cpu_s, sec_s,
                        rev_s[get_cpu_rev()], max_clk);
 

diff --git a/arch/arm/include/asm/arch-omap3/omap3.h b/arch/arm/include/asm/arch-omap3/omap3.h
index 230eaadaa845db486574a220f34af7c8d112a9b5..c7874084c1e42b243ef82b57e78b5e1d0d469cc1 100644 (file)
--- a/arch/arm/include/asm/arch-omap3/omap3.h
+++ b/arch/arm/include/asm/arch-omap3/omap3.h
@@ -191,6 +191,16 @@ struct gpio {
 #define CPU_3XX_ES312          7
 #define CPU_3XX_MAX_REV                8
 
+/*
+ * 37xx real hardware:
+ * ES1.0 onwards, the value maps to contents of IDCODE register [31:28].
+ */
+
+#define CPU_37XX_ES10          0
+#define CPU_37XX_ES11          1
+#define CPU_37XX_ES12          2
+#define CPU_37XX_MAX_REV       3
+
 #define CPU_3XX_ID_SHIFT       28
 
 #define WIDTH_8BIT             0x0000