OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
authorAndy Green <andy@warmcat.com>
Sat, 12 Mar 2011 22:50:54 +0000 (22:50 +0000)
committerTony Lindgren <tony@atomide.com>
Mon, 14 Mar 2011 18:12:54 +0000 (11:12 -0700)
This adapts the register offsets used to read the CPU DIE ID registers
when run on 44XX so they match what is in the OMAP4430 Reference Manual
page 269

Signed-off-by: Andy Green <andy.green@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/id.c

index 3168b17bc264c604315a4d0a4f68e66dcbe1eecd..2537090aa33a3a0ee6e840258c05771d3fd46ba9 100644 (file)
@@ -84,6 +84,11 @@ EXPORT_SYMBOL(omap_type);
 #define OMAP_TAP_DIE_ID_2      0x0220
 #define OMAP_TAP_DIE_ID_3      0x0224
 
+#define OMAP_TAP_DIE_ID_44XX_0 0x0200
+#define OMAP_TAP_DIE_ID_44XX_1 0x0208
+#define OMAP_TAP_DIE_ID_44XX_2 0x020c
+#define OMAP_TAP_DIE_ID_44XX_3 0x0210
+
 #define read_tap_reg(reg)      __raw_readl(tap_base  + (reg))
 
 struct omap_id {
@@ -107,6 +112,14 @@ static u16 tap_prod_id;
 
 void omap_get_die_id(struct omap_die_id *odi)
 {
+       if (cpu_is_omap44xx()) {
+               odi->id_0 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_0);
+               odi->id_1 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_1);
+               odi->id_2 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_2);
+               odi->id_3 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_3);
+
+               return;
+       }
        odi->id_0 = read_tap_reg(OMAP_TAP_DIE_ID_0);
        odi->id_1 = read_tap_reg(OMAP_TAP_DIE_ID_1);
        odi->id_2 = read_tap_reg(OMAP_TAP_DIE_ID_2);