OMAP5: ADD chip detection for OMAP5432 SOC

This patch adds chip detection for OMAP5432

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

diff --git a/arch/arm/cpu/armv7/omap5/hwinit.c b/arch/arm/cpu/armv7/omap5/hwinit.c
index d01cc81..e2f76a1 100644 (file)
--- a/arch/arm/cpu/armv7/omap5/hwinit.c
+++ b/arch/arm/cpu/armv7/omap5/hwinit.c
@@ -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;

diff --git a/arch/arm/include/asm/arch-omap5/omap.h b/arch/arm/include/asm/arch-omap5/omap.h
index 3d4d08c..94b6f3a 100644 (file)
--- a/arch/arm/include/asm/arch-omap5/omap.h
+++ b/arch/arm/include/asm/arch-omap5/omap.h
@@ -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)

diff --git a/arch/arm/include/asm/omap_common.h b/arch/arm/include/asm/omap_common.h
index 459b6b1..4e95eee 100644 (file)
--- a/arch/arm/include/asm/omap_common.h
+++ b/arch/arm/include/asm/omap_common.h
@@ -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_ */