GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-20 22:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

omap4: replacing OMAP4_CONTROL with OMAP4430_CONTROL

Browse source 
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>
This commit is contained in:
Ricardo Salveti de Araujo 2011-09-21 10:17:29 +00:00 • committed by Albert ARIBAUD
parent cebad16461
commit 20033c9f87
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/cpu/armv7/omap4/board.c
View file

@ -200,13 +200,13 @@ static void init_omap4_revision(void)
break; break;
case MIDR_CORTEX_A9_R1P2: case MIDR_CORTEX_A9_R1P2:
switch (readl(CONTROL_ID_CODE)) { switch (readl(CONTROL_ID_CODE)) {
case OMAP4_CONTROL_ID_CODE_ES2_0: case OMAP4430_CONTROL_ID_CODE_ES2_0:
*omap4_revision = OMAP4430_ES2_0; *omap4_revision = OMAP4430_ES2_0;
break; break;
case OMAP4_CONTROL_ID_CODE_ES2_1: case OMAP4430_CONTROL_ID_CODE_ES2_1:
*omap4_revision = OMAP4430_ES2_1; *omap4_revision = OMAP4430_ES2_1;
break; break;
case OMAP4_CONTROL_ID_CODE_ES2_2: case OMAP4430_CONTROL_ID_CODE_ES2_2:
*omap4_revision = OMAP4430_ES2_2; *omap4_revision = OMAP4430_ES2_2;
break; break;
default: default:

10
arch/arm/include/asm/arch-omap4/omap4.h
View file

@ -57,11 +57,11 @@
/* CONTROL_ID_CODE */ /* CONTROL_ID_CODE */
#define CONTROL_ID_CODE 0x4A002204 #define CONTROL_ID_CODE 0x4A002204
#define OMAP4_CONTROL_ID_CODE_ES1_0 0x0B85202F #define OMAP4430_CONTROL_ID_CODE_ES1_0 0x0B85202F
#define OMAP4_CONTROL_ID_CODE_ES2_0 0x1B85202F #define OMAP4430_CONTROL_ID_CODE_ES2_0 0x1B85202F
#define OMAP4_CONTROL_ID_CODE_ES2_1 0x3B95C02F #define OMAP4430_CONTROL_ID_CODE_ES2_1 0x3B95C02F
#define OMAP4_CONTROL_ID_CODE_ES2_2 0x4B95C02F #define OMAP4430_CONTROL_ID_CODE_ES2_2 0x4B95C02F
#define OMAP4_CONTROL_ID_CODE_ES2_3 0x6B95C02F #define OMAP4430_CONTROL_ID_CODE_ES2_3 0x6B95C02F
/* UART */ /* UART */
#define UART1_BASE (OMAP44XX_L4_PER_BASE + 0x6a000) #define UART1_BASE (OMAP44XX_L4_PER_BASE + 0x6a000)