diff options
| author | Tony Lindgren | 2011-11-05 01:40:52 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2011-11-05 01:40:52 +0100 |
| commit | 7fd92b56e5508fc3453ac9a65e11561178e86330 (patch) | |
| tree | 8fad9740a733326b580f4a39ddaac84ae5e6674d /arch/arm/mach-omap2/id.c | |
| parent | Merge branch 'prcm_scm_misc_fixes_3.2' of git://git.pwsan.com/linux-2.6 into ... (diff) | |
| parent | ARM: OMAP3: PM: restrict erratum i443 handling to OMAP3430 only (diff) | |
| download | kernel-qcow2-linux-7fd92b56e5508fc3453ac9a65e11561178e86330.tar.gz kernel-qcow2-linux-7fd92b56e5508fc3453ac9a65e11561178e86330.tar.xz kernel-qcow2-linux-7fd92b56e5508fc3453ac9a65e11561178e86330.zip | |
Merge branch 'for_3.2/pm-cleanup-2' of git://github.com/khilman/linux-omap-pm into fixes
Diffstat (limited to 'arch/arm/mach-omap2/id.c')
| -rw-r--r-- | arch/arm/mach-omap2/id.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index d27daf921c7e..7f47092a193f 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c @@ -187,8 +187,11 @@ static void __init omap3_check_features(void) OMAP3_CHECK_FEATURE(status, ISP); if (cpu_is_omap3630()) omap_features |= OMAP3_HAS_192MHZ_CLK; - if (!cpu_is_omap3505() && !cpu_is_omap3517()) + if (cpu_is_omap3430() || cpu_is_omap3630()) omap_features |= OMAP3_HAS_IO_WAKEUP; + if (cpu_is_omap3630() || omap_rev() == OMAP3430_REV_ES3_1 || + omap_rev() == OMAP3430_REV_ES3_1_2) + omap_features |= OMAP3_HAS_IO_CHAIN_CTRL; omap_features |= OMAP3_HAS_SDRC; |