diff options
author | Lokesh Vutla <lokeshvutla@ti.com> | 2014-02-07 05:21:24 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-02-28 18:33:26 -0500 |
commit | 4a2ed4c0a3269a3a8cf269f5177f18c836ce869b (patch) | |
tree | 5fb76f550fbcc90d95d76e500f60d6764f360da4 | |
parent | 1ba194fe9f4b6d5084c0085b2cb40cf27e0bf875 (diff) |
ARM: OMAP2+: AM43x: Add ID for ES1.1
Adding ID for AM437x ES1.1 silicon.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/id.c | 14 | ||||
-rw-r--r-- | arch/arm/mach-omap2/soc.h | 3 |
2 files changed, 14 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 9428c5f9d4f2..8a05eaf85f8a 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
@@ -465,8 +465,18 @@ void __init omap3xxx_check_revision(void) | |||
465 | } | 465 | } |
466 | break; | 466 | break; |
467 | case 0xb98c: | 467 | case 0xb98c: |
468 | omap_revision = AM437X_REV_ES1_0; | 468 | switch (rev) { |
469 | cpu_rev = "1.0"; | 469 | case 0: |
470 | omap_revision = AM437X_REV_ES1_0; | ||
471 | cpu_rev = "1.0"; | ||
472 | break; | ||
473 | case 1: | ||
474 | /* FALLTHROUGH */ | ||
475 | default: | ||
476 | omap_revision = AM437X_REV_ES1_1; | ||
477 | cpu_rev = "1.1"; | ||
478 | break; | ||
479 | } | ||
470 | break; | 480 | break; |
471 | case 0xb8f2: | 481 | case 0xb8f2: |
472 | switch (rev) { | 482 | switch (rev) { |
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index 076bd90a6ce0..30abcc8b20e0 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h | |||
@@ -438,7 +438,8 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
438 | #define AM335X_REV_ES2_1 (AM335X_CLASS | (0x2 << 8)) | 438 | #define AM335X_REV_ES2_1 (AM335X_CLASS | (0x2 << 8)) |
439 | 439 | ||
440 | #define AM437X_CLASS 0x43700000 | 440 | #define AM437X_CLASS 0x43700000 |
441 | #define AM437X_REV_ES1_0 AM437X_CLASS | 441 | #define AM437X_REV_ES1_0 (AM437X_CLASS | (0x10 << 8)) |
442 | #define AM437X_REV_ES1_1 (AM437X_CLASS | (0x11 << 8)) | ||
442 | 443 | ||
443 | #define OMAP443X_CLASS 0x44300044 | 444 | #define OMAP443X_CLASS 0x44300044 |
444 | #define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 << 8)) | 445 | #define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 << 8)) |