The 35xx TRM lists incorrect values for the VERSION field of the
CONTROL_IDCODE register.  The correct values are those listed in
the 34xx TRM.

Correct message on boot verified on ES2.1 and ES3.0.

Signed-off-by: Mans Rullgard <[EMAIL PROTECTED]>
---
 arch/arm/mach-omap2/id.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index ab7a6e9..9f72ae6 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -162,14 +162,15 @@ void __init omap34xx_check_revision(void)
        /*
         * Detection for 34xx ES2.0 and above can be done with just
         * hawkeye and rev. See TRM 1.5.2 Device Identification.
-        * Note that rev cannot be used directly as ES1.0 uses value 0.
+        * The 35xx TRM lists incorrect values for the revision number.
+        * Correct values are documented in the 34xx TRM.
         */
        idcode = read_tap_reg(OMAP_TAP_IDCODE);
        hawkeye = (idcode >> 12) & 0xffff;
        rev = (idcode >> 28) & 0xff;
 
        if (hawkeye == 0xb7ae)
-               system_rev = 0x34300034 | ((1 + rev) << 12);
+               system_rev = 0x34300034 | (rev << 12);
 
 out:
        switch (system_rev) {
-- 
1.6.0.2

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to