omap: Use omap_get_die_id() to get the DIE ids

Signed-off-by: Kan-Ru Chen <kanru@0xlab.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index d079ccfa294e..fd1904b013fa 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -118,24 +118,22 @@ static void __init omap24xx_check_revision(void)
         u32 idcode, prod_id;
         u16 hawkeye;
         u8  dev_type, rev;
+        struct omap_die_id odi;
 
         idcode = read_tap_reg(OMAP_TAP_IDCODE);
         prod_id = read_tap_reg(tap_prod_id);
         hawkeye = (idcode >> 12) & 0xffff;
         rev = (idcode >> 28) & 0x0f;
         dev_type = (prod_id >> 16) & 0x0f;
+        omap_get_die_id(&odi);
 
         pr_debug("OMAP_TAP_IDCODE 0x%08x REV %i HAWKEYE 0x%04x MANF %03x\n",
                  idcode, rev, hawkeye, (idcode >> 1) & 0x7ff);
-        pr_debug("OMAP_TAP_DIE_ID_0: 0x%08x\n",
-                 read_tap_reg(OMAP_TAP_DIE_ID_0));
+        pr_debug("OMAP_TAP_DIE_ID_0: 0x%08x\n", odi.id_0);
         pr_debug("OMAP_TAP_DIE_ID_1: 0x%08x DEV_REV: %i\n",
-                 read_tap_reg(OMAP_TAP_DIE_ID_1),
-                 (read_tap_reg(OMAP_TAP_DIE_ID_1) >> 28) & 0xf);
-        pr_debug("OMAP_TAP_DIE_ID_2: 0x%08x\n",
-                 read_tap_reg(OMAP_TAP_DIE_ID_2));
-        pr_debug("OMAP_TAP_DIE_ID_3: 0x%08x\n",
-                 read_tap_reg(OMAP_TAP_DIE_ID_3));
+                 odi.id_1, (odi.id_1 >> 28) & 0xf);
+        pr_debug("OMAP_TAP_DIE_ID_2: 0x%08x\n", odi.id_2);
+        pr_debug("OMAP_TAP_DIE_ID_3: 0x%08x\n", odi.id_3);
         pr_debug("OMAP_TAP_PROD_ID_0: 0x%08x DEV_TYPE: %i\n",
                  prod_id, dev_type);