omap4: replacing OMAP4_CONTROL with OMAP4430_CONTROL

OMAP4460 has a different set of values for the ID code, so moving the
old ones to be related just with 4430.

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
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 8584fdd590382a2b8f23da2e6ce4e75c6d759e81..86ddef28d71df096359498b3a90a95df7321ef3b 100644 (file)
--- a/arch/arm/cpu/armv7/omap4/board.c
+++ b/arch/arm/cpu/armv7/omap4/board.c
@@ -200,13 +200,13 @@ static void init_omap4_revision(void)
                break;
        case MIDR_CORTEX_A9_R1P2:
                switch (readl(CONTROL_ID_CODE)) {
-               case OMAP4_CONTROL_ID_CODE_ES2_0:
+               case OMAP4430_CONTROL_ID_CODE_ES2_0:
                        *omap4_revision = OMAP4430_ES2_0;
                        break;
-               case OMAP4_CONTROL_ID_CODE_ES2_1:
+               case OMAP4430_CONTROL_ID_CODE_ES2_1:
                        *omap4_revision = OMAP4430_ES2_1;
                        break;
-               case OMAP4_CONTROL_ID_CODE_ES2_2:
+               case OMAP4430_CONTROL_ID_CODE_ES2_2:
                        *omap4_revision = OMAP4430_ES2_2;
                        break;
                default:

diff --git a/arch/arm/include/asm/arch-omap4/omap4.h b/arch/arm/include/asm/arch-omap4/omap4.h
index fc9c555d264deb50018b7a2364271fa8a4e77e59..38f4eb1996532f8b465aeefe6c1f5bac728e2430 100644 (file)
--- a/arch/arm/include/asm/arch-omap4/omap4.h
+++ b/arch/arm/include/asm/arch-omap4/omap4.h
@@ -57,11 +57,11 @@
 /* CONTROL_ID_CODE */
 #define CONTROL_ID_CODE                0x4A002204
 
-#define OMAP4_CONTROL_ID_CODE_ES1_0    0x0B85202F
-#define OMAP4_CONTROL_ID_CODE_ES2_0    0x1B85202F
-#define OMAP4_CONTROL_ID_CODE_ES2_1    0x3B95C02F
-#define OMAP4_CONTROL_ID_CODE_ES2_2    0x4B95C02F
-#define OMAP4_CONTROL_ID_CODE_ES2_3    0x6B95C02F
+#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
 
 /* UART */
 #define UART1_BASE             (OMAP44XX_L4_PER_BASE + 0x6a000)