Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel

1 files changed, 3 insertions, 1 deletions

diff --git a/arch/arm/mach-omap1/id.c b/arch/arm/mach-omap1/id.c
index 89bb8756f450..4ef26faf083e 100644
--- a/arch/arm/mach-omap1/id.c
+++ b/arch/arm/mach-omap1/id.c
@@ -38,6 +38,7 @@ static struct omap_id omap_ids[] __initdata = {
         { .jtag_id = 0xb574, .die_rev = 0x2, .omap_id = 0x03310315, .type = 0x03100000},
         { .jtag_id = 0x355f, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x07300100},
         { .jtag_id = 0xb55f, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x07300300},
+        { .jtag_id = 0xb55f, .die_rev = 0x0, .omap_id = 0x03320500, .type = 0x08500000},
         { .jtag_id = 0xb470, .die_rev = 0x0, .omap_id = 0x03310100, .type = 0x15100000},
         { .jtag_id = 0xb576, .die_rev = 0x0, .omap_id = 0x03320000, .type = 0x16100000},
         { .jtag_id = 0xb576, .die_rev = 0x2, .omap_id = 0x03320100, .type = 0x16110000},
@@ -77,7 +78,7 @@ static u16 __init omap_get_jtag_id(void)
         prod_id = omap_readl(OMAP_PRODUCTION_ID_1);
         omap_id = omap_readl(OMAP32_ID_1);
 
-        /* Check for unusable OMAP_PRODUCTION_ID_1 on 1611B/5912 and 730 */
+        /* Check for unusable OMAP_PRODUCTION_ID_1 on 1611B/5912 and 730/850 */
         if (((prod_id >> 20) == 0) || (prod_id == omap_id))
                 prod_id = 0;
         else
@@ -178,6 +179,7 @@ void __init omap_check_revision(void)
 
         switch (cpu_type) {
         case 0x07:
+        case 0x08:
                 omap_revision |= 0x07;
                 break;
         case 0x03: