diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-06-04 02:09:45 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-04 02:09:45 -0700 |
| commit | 4564747649db987722aa781280eb8325c6a5a1a8 (patch) | |
| tree | c75bd92f4c6a59e9873088f1e5357cd3242977cd /arch/arm/mach-omap2/id.c | |
| parent | f8f5701bdaf9134b1f90e5044a82c66324d2073f (diff) | |
| parent | 1ce029968718477149e7f1fb245a8e82c690cc4a (diff) | |
| download | linux-4564747649db987722aa781280eb8325c6a5a1a8.tar.bz2 | |
Merge branch 'for_3.5/fixes/pm' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 0389b3264abe..00486a8564fd 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -247,6 +247,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. */ |