OMAP5: ADD chip detection for OMAP5432 SOC
authorLokesh Vutla <lokeshvutla@ti.com>
Tue, 22 May 2012 00:03:22 +0000 (00:03 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 7 Jul 2012 12:07:23 +0000 (14:07 +0200)
This patch adds chip detection for OMAP5432

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
arch/arm/cpu/armv7/omap5/hwinit.c
arch/arm/include/asm/arch-omap5/omap.h
arch/arm/include/asm/omap_common.h

index d01cc81333ba62c6b35e38959fbdfe10229cc4e4..e2f76a1bbde962396b8780b34adae35570eeb141 100644 (file)
@@ -154,7 +154,15 @@ void init_omap_revision(void)
 
        switch (rev) {
        case MIDR_CORTEX_A15_R0P0:
-               *omap_si_rev = OMAP5430_ES1_0;
+               switch (readl(CONTROL_ID_CODE)) {
+               case OMAP5430_CONTROL_ID_CODE_ES1_0:
+                       *omap_si_rev = OMAP5430_ES1_0;
+                       break;
+               case OMAP5432_CONTROL_ID_CODE_ES1_0:
+               default:
+                       *omap_si_rev = OMAP5432_ES1_0;
+                       break;
+               }
                break;
        default:
                *omap_si_rev = OMAP5430_SILICON_ID_INVALID;
index 3d4d08c8836b4f95cc590664962598870adc80a2..94b6f3a89bda3ae15c99d4ccaaceb3280a9c1e35 100644 (file)
@@ -56,7 +56,8 @@
 #define CONTROL_ID_CODE                (CTRL_BASE + 0x204)
 
 /* To be verified */
-#define OMAP5_CONTROL_ID_CODE_ES1_0    0x0B94202F
+#define OMAP5430_CONTROL_ID_CODE_ES1_0         0x0B94202F
+#define OMAP5432_CONTROL_ID_CODE_ES1_0         0x0B99802F
 
 /* STD_FUSE_PROD_ID_1 */
 #define STD_FUSE_PROD_ID_1             (CTRL_BASE + 0x218)
index 459b6b16e24e1902055f103748d810b68c097e03..4e95eee59b46612e3c56c135d1b89faa5c9c7257 100644 (file)
@@ -136,4 +136,5 @@ static inline u32 omap_revision(void)
 /* omap5 */
 #define OMAP5430_SILICON_ID_INVALID    0
 #define OMAP5430_ES1_0 0x54300100
+#define OMAP5432_ES1_0 0x54320100
 #endif /* _OMAP_COMMON_H_ */