summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRicardo Salveti de Araujo <ricardo.salveti@linaro.org>2011-09-21 10:17:29 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-10-27 21:56:33 +0200
commit20033c9f87ef6aa9834aeab19bc363abc3d92a4d (patch)
treeb5f7896fa10f8a862bcf12157c2ebc8b556c8d6d
parentcebad16461dc5f1849bd0c9e8353a0e7af1a119b (diff)
downloadu-boot-imx-20033c9f87ef6aa9834aeab19bc363abc3d92a4d.zip
u-boot-imx-20033c9f87ef6aa9834aeab19bc363abc3d92a4d.tar.gz
u-boot-imx-20033c9f87ef6aa9834aeab19bc363abc3d92a4d.tar.bz2
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>
-rw-r--r--arch/arm/cpu/armv7/omap4/board.c6
-rw-r--r--arch/arm/include/asm/arch-omap4/omap4.h10
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c
index 8584fdd..86ddef2 100644
--- 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 fc9c555..38f4eb1 100644
--- 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)