Merge branch 'fixes-rc2' into omap-for-v4.6/fixes

[linux-2.6-block.git] / arch / arm / mach-omap2 / id.c

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index d85c24918c177d176fd191aa1ebcfaff5ce90f74..b2f56684c337bddc44e080370ed1ffcdc19d0a46 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -46,6 +46,7 @@ u32 omap_features;
 
 unsigned int omap_rev(void)
 {
+       WARN_ON_ONCE(!omap_revision || omap_revision == -1);
        return omap_revision;
 }
 EXPORT_SYMBOL(omap_rev);
@@ -669,9 +670,9 @@ void __init dra7xxx_check_revision(void)
                case 0:
                        omap_revision = DRA722_REV_ES1_0;
                        break;
+               case 1:
                default:
-                       /* If we have no new revisions */
-                       omap_revision = DRA722_REV_ES1_0;
+                       omap_revision = DRA722_REV_ES2_0;
                        break;
                }
                break;