diff options
author | Anand Gadiyar <gadiyar@ti.com> | 2012-03-28 13:29:06 +0800 |
---|---|---|
committer | Andy Green <andy.green@linaro.org> | 2012-03-28 13:29:06 +0800 |
commit | 530ca2535dfa30e2e85dae604f28f055233efc4c (patch) | |
tree | b4571871e207a2d9f5e72cf086bbda4052475046 | |
parent | 9846991f3094aacbecdd5f6edfa57031c8e38f3f (diff) |
omap4: add 4430 ES2.3 support
And default to 4430 ES2.3 for unidentified silicon.
Change-Id: I06b0aa9c5f33af25345996cf9d0c994491093096
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Signed-off-by: Sebastien Jan <s-jan@ti.com>
-rw-r--r-- | arch/arm/mach-omap2/id.c | 9 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/cpu.h | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 19c02fd0321..d657f749da7 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -404,9 +404,12 @@ static void __init omap4_check_revision(void) omap_chip.oc |= CHIP_IS_OMAP4430ES2_1; break; case 4: - default: omap_revision = OMAP4430_REV_ES2_2; omap_chip.oc |= CHIP_IS_OMAP4430ES2_2; + case 6: + default: + omap_revision = OMAP4430_REV_ES2_3; + omap_chip.oc |= CHIP_IS_OMAP4430ES2_3; } break; case 0xb94e: @@ -424,8 +427,8 @@ static void __init omap4_check_revision(void) break; default: /* Unknown default to latest silicon rev as default */ - omap_revision = OMAP4430_REV_ES2_2; - omap_chip.oc |= CHIP_IS_OMAP4430ES2_2; + omap_revision = OMAP4430_REV_ES2_3; + omap_chip.oc |= CHIP_IS_OMAP4430ES2_3; } pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16, diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index a3b9877893e..aadf23358d5 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h @@ -414,6 +414,7 @@ IS_OMAP_TYPE(3517, 0x3517) #define OMAP4430_REV_ES2_0 (OMAP443X_CLASS | (0x20 << 8)) #define OMAP4430_REV_ES2_1 (OMAP443X_CLASS | (0x21 << 8)) #define OMAP4430_REV_ES2_2 (OMAP443X_CLASS | (0x22 << 8)) +#define OMAP4430_REV_ES2_3 (OMAP443X_CLASS | (0x23 << 8)) #define OMAP446X_CLASS 0x44600044 #define OMAP4460_REV_ES1_0 (OMAP446X_CLASS | (0x10 << 8)) @@ -447,16 +448,18 @@ IS_OMAP_TYPE(3517, 0x3517) #define CHIP_IS_OMAP4430ES2 (1 << 11) #define CHIP_IS_OMAP4430ES2_1 (1 << 12) #define CHIP_IS_OMAP4430ES2_2 (1 << 13) -#define CHIP_IS_TI816X (1 << 14) -#define CHIP_IS_OMAP4460ES1_0 (1 << 15) -#define CHIP_IS_OMAP4460ES1_1 (1 << 16) +#define CHIP_IS_OMAP4430ES2_3 (1 << 14) +#define CHIP_IS_TI816X (1 << 15) +#define CHIP_IS_OMAP4460ES1_0 (1 << 16) +#define CHIP_IS_OMAP4460ES1_1 (1 << 17) #define CHIP_IS_OMAP24XX (CHIP_IS_OMAP2420 | CHIP_IS_OMAP2430) #define CHIP_IS_OMAP4430 (CHIP_IS_OMAP4430ES1 | \ CHIP_IS_OMAP4430ES2 | \ CHIP_IS_OMAP4430ES2_1 | \ - CHIP_IS_OMAP4430ES2_2) + CHIP_IS_OMAP4430ES2_2 | \ + CHIP_IS_OMAP4430ES2_3) #define CHIP_IS_OMAP446X (CHIP_IS_OMAP4460ES1_0 | \ CHIP_IS_OMAP4460ES1_1) |