aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorDavid Anders <x0132446@ti.com>2011-12-13 13:46:44 -0500
committerTony Lindgren <tony@atomide.com>2011-12-13 13:46:44 -0500
commit55035c1524b5b48ac7d267167c4895f7831897ad (patch)
tree21ae083b23c752a1b8ec635a4884fb98ae88a221 /arch/arm
parent1e6cb146c39cdef1ffc340c13637fce2ba5575be (diff)
ARM: OMAP: id: add chip id recognition for omap4430 es2.3
allow for the omap4430 es2.3 revision to be recognized in the omap4_check_revision() function. most aspects of all omap4430 es2.x versions are identical, however a number of small variations such as default pullup or pulldown resistor configurations vary between revisions. detailed information on silicon errata for omap4430 revisions can be found at http://focus.ti.com/pdfs/wtbu/swpz009D.pdf Signed-off-by: David Anders <x0132446@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/id.c7
-rw-r--r--arch/arm/plat-omap/include/plat/cpu.h1
2 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 7ab09f764600..5bb4ee18564a 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -393,8 +393,11 @@ static void __init omap4_check_revision(void)
393 omap_revision = OMAP4430_REV_ES2_1; 393 omap_revision = OMAP4430_REV_ES2_1;
394 break; 394 break;
395 case 4: 395 case 4:
396 default:
397 omap_revision = OMAP4430_REV_ES2_2; 396 omap_revision = OMAP4430_REV_ES2_2;
397 break;
398 case 6:
399 default:
400 omap_revision = OMAP4430_REV_ES2_3;
398 } 401 }
399 break; 402 break;
400 case 0xb94e: 403 case 0xb94e:
@@ -407,7 +410,7 @@ static void __init omap4_check_revision(void)
407 break; 410 break;
408 default: 411 default:
409 /* Unknown default to latest silicon rev as default */ 412 /* Unknown default to latest silicon rev as default */
410 omap_revision = OMAP4430_REV_ES2_2; 413 omap_revision = OMAP4430_REV_ES2_3;
411 } 414 }
412 415
413 pr_info("OMAP%04x ES%d.%d\n", omap_rev() >> 16, 416 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 aa52d1e61eb1..e5baa3cde900 100644
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -416,6 +416,7 @@ IS_OMAP_TYPE(3517, 0x3517)
416#define OMAP4430_REV_ES2_0 (OMAP443X_CLASS | (0x20 << 8)) 416#define OMAP4430_REV_ES2_0 (OMAP443X_CLASS | (0x20 << 8))
417#define OMAP4430_REV_ES2_1 (OMAP443X_CLASS | (0x21 << 8)) 417#define OMAP4430_REV_ES2_1 (OMAP443X_CLASS | (0x21 << 8))
418#define OMAP4430_REV_ES2_2 (OMAP443X_CLASS | (0x22 << 8)) 418#define OMAP4430_REV_ES2_2 (OMAP443X_CLASS | (0x22 << 8))
419#define OMAP4430_REV_ES2_3 (OMAP443X_CLASS | (0x23 << 8))
419 420
420#define OMAP446X_CLASS 0x44600044 421#define OMAP446X_CLASS 0x44600044
421#define OMAP4460_REV_ES1_0 (OMAP446X_CLASS | (0x10 << 8)) 422#define OMAP4460_REV_ES1_0 (OMAP446X_CLASS | (0x10 << 8))