omap4: adding revision detection for 4460 ES1.1

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
 2 files changed, 17 insertions(+), 1 deletions(-)
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>

diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c
index 86ddef28d71df096359498b3a90a95df7321ef3b..6d8811f4847cf097f74aed9b36b77af3ffd0ed09 100644 (file)
--- a/arch/arm/cpu/armv7/omap4/board.c
+++ b/arch/arm/cpu/armv7/omap4/board.c
@@ -218,7 +218,17 @@ static void init_omap4_revision(void)
                *omap4_revision = OMAP4430_ES2_3;
                break;
        case MIDR_CORTEX_A9_R2P10:
-               *omap4_revision = OMAP4460_ES1_0;
+               switch (readl(CONTROL_ID_CODE)) {
+               case OMAP4460_CONTROL_ID_CODE_ES1_0:
+                       *omap4_revision = OMAP4460_ES1_0;
+                       break;
+               case OMAP4460_CONTROL_ID_CODE_ES1_1:
+                       *omap4_revision = OMAP4460_ES1_1;
+                       break;
+               default:
+                       *omap4_revision = OMAP4460_ES1_0;
+                       break;
+               }
                break;
        default:
                *omap4_revision = OMAP4430_SILICON_ID_INVALID;

diff --git a/arch/arm/include/asm/arch-omap4/omap4.h b/arch/arm/include/asm/arch-omap4/omap4.h
index 38f4eb1996532f8b465aeefe6c1f5bac728e2430..61ebb3d46d5bc52c79fed1ddd4f9718fbddfd902 100644 (file)
--- a/arch/arm/include/asm/arch-omap4/omap4.h
+++ b/arch/arm/include/asm/arch-omap4/omap4.h
@@ -57,12 +57,17 @@
 /* CONTROL_ID_CODE */
 #define CONTROL_ID_CODE                0x4A002204
 
+/* 4430 */
 #define OMAP4430_CONTROL_ID_CODE_ES1_0 0x0B85202F
 #define OMAP4430_CONTROL_ID_CODE_ES2_0 0x1B85202F
 #define OMAP4430_CONTROL_ID_CODE_ES2_1 0x3B95C02F
 #define OMAP4430_CONTROL_ID_CODE_ES2_2 0x4B95C02F
 #define OMAP4430_CONTROL_ID_CODE_ES2_3 0x6B95C02F
 
+/* 4460 */
+#define OMAP4460_CONTROL_ID_CODE_ES1_0 0x0B94E02F
+#define OMAP4460_CONTROL_ID_CODE_ES1_1 0x2B94E02F
+
 /* UART */
 #define UART1_BASE             (OMAP44XX_L4_PER_BASE + 0x6a000)
 #define UART2_BASE             (OMAP44XX_L4_PER_BASE + 0x6c000)
@@ -191,6 +196,7 @@ struct control_lpddr2io_regs {
 #define OMAP4430_ES2_2 0x44300220
 #define OMAP4430_ES2_3 0x44300230
 #define OMAP4460_ES1_0 0x44600100
+#define OMAP4460_ES1_1 0x44600110
 
 /* ROM code defines */
 /* Boot device */