aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLokesh Vutla <lokeshvutla@ti.com>2014-11-27 22:32:07 -0500
committerTony Lindgren <tony@atomide.com>2014-12-10 12:33:50 -0500
commit4fdd54f017d05e21e592992d68be08c6590b4b94 (patch)
tree4ff01dba70002aa966b210f5e65072cd2866144c
parent58230c2c443bc9801293f6535144d04ceaf731e0 (diff)
ARM: OMAP2+: AM43x: Add ID for ES1.2
ES1.2 is a minor variant of ES1.1. Major changes since ES1.1 are updating ROM for fixing the following boot modes: - NAND boot - UART boot - Ethernet boot - USB HOST/Client boot This patch adds ID support for AM437x ES1.2 silicon. There are no additional kernel fixes required for ES1.2 silicon. Latest Technical Documentation can be found here: http://www.ti.com/lsds/ti/arm/sitara_arm_cortex_a_processor/arm_cortex_a9_core/am437x_arm_cortex_a9/tech_docs.page Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Reviewed-by: Nishanth Menon <nm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/id.c8
-rw-r--r--arch/arm/mach-omap2/soc.h1
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 53841dea80ea..c25feba05818 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -471,11 +471,15 @@ void __init omap3xxx_check_revision(void)
471 cpu_rev = "1.0"; 471 cpu_rev = "1.0";
472 break; 472 break;
473 case 1: 473 case 1:
474 /* FALLTHROUGH */
475 default:
476 omap_revision = AM437X_REV_ES1_1; 474 omap_revision = AM437X_REV_ES1_1;
477 cpu_rev = "1.1"; 475 cpu_rev = "1.1";
478 break; 476 break;
477 case 2:
478 /* FALLTHROUGH */
479 default:
480 omap_revision = AM437X_REV_ES1_2;
481 cpu_rev = "1.2";
482 break;
479 } 483 }
480 break; 484 break;
481 case 0xb8f2: 485 case 0xb8f2:
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 4376f59626d1..c1a3b4416311 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -446,6 +446,7 @@ IS_OMAP_TYPE(3430, 0x3430)
446#define AM437X_CLASS 0x43700000 446#define AM437X_CLASS 0x43700000
447#define AM437X_REV_ES1_0 (AM437X_CLASS | (0x10 << 8)) 447#define AM437X_REV_ES1_0 (AM437X_CLASS | (0x10 << 8))
448#define AM437X_REV_ES1_1 (AM437X_CLASS | (0x11 << 8)) 448#define AM437X_REV_ES1_1 (AM437X_CLASS | (0x11 << 8))
449#define AM437X_REV_ES1_2 (AM437X_CLASS | (0x12 << 8))
449 450
450#define OMAP443X_CLASS 0x44300044 451#define OMAP443X_CLASS 0x44300044
451#define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 << 8)) 452#define OMAP4430_REV_ES1_0 (OMAP443X_CLASS | (0x10 << 8))