From 77bd1fc310c82e36937428edd9b2b1d0cc793555 Mon Sep 17 00:00:00 2001
From: "Mark A. Greer" <mgreer@animalcreek.com>
Date: Mon, 30 Apr 2012 16:57:09 -0700
Subject: [PATCH] --- yaml --- r: 311005 b: refs/heads/master c:
 1ce029968718477149e7f1fb245a8e82c690cc4a h: refs/heads/master i:   311003:
 8bda9a85c64336505232e71c495945b1c6407c99 v: v3

---
 [refs]                         |  2 +-
 trunk/arch/arm/mach-omap2/id.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8467da3d0192..7215b6448d28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99b59df04899a048d1a3ed8bc2b1263779816868
+refs/heads/master: 1ce029968718477149e7f1fb245a8e82c690cc4a
diff --git a/trunk/arch/arm/mach-omap2/id.c b/trunk/arch/arm/mach-omap2/id.c
index f611e3097157..38ae74f8e77a 100644
--- a/trunk/arch/arm/mach-omap2/id.c
+++ b/trunk/arch/arm/mach-omap2/id.c
@@ -246,6 +246,17 @@ void __init omap3xxx_check_features(void)
 
 	omap_features |= OMAP3_HAS_SDRC;
 
+	/*
+	 * am35x fixups:
+	 * - The am35x Chip ID register has bits 12, 7:5, and 3:2 marked as
+	 *   reserved and therefore return 0 when read.  Unfortunately,
+	 *   OMAP3_CHECK_FEATURE() will interpret some of those zeroes to
+	 *   mean that a feature is present even though it isn't so clear
+	 *   the incorrectly set feature bits.
+	 */
+	if (soc_is_am35xx())
+		omap_features &= ~(OMAP3_HAS_IVA | OMAP3_HAS_ISP);
+
 	/*
 	 * TODO: Get additional info (where applicable)
 	 *       e.g. Size of L2 cache.