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>

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 7ab09f764600075e621b06fdc8301119387da665..5bb4ee18564afa2942e4b780f9cfe4e0b6d40631 100644 (file)
--- 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)
                        omap_revision = OMAP4430_REV_ES2_1;
                        break;
                case 4:
-               default:
                        omap_revision = OMAP4430_REV_ES2_2;
+                       break;
+               case 6:
+               default:
+                       omap_revision = OMAP4430_REV_ES2_3;
                }
                break;
        case 0xb94e:
@@ -407,7 +410,7 @@ static void __init omap4_check_revision(void)
                break;
        default:
                /* Unknown default to latest silicon rev as default */
-               omap_revision = OMAP4430_REV_ES2_2;
+               omap_revision = OMAP4430_REV_ES2_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 aa52d1e61eb13eee3fccecd95fdd0d78a5de75de..e5baa3cde900c3c1d579ac2a4de7377bc2e1857d 100644 (file)
--- 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)
 #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))