Merge branch 'for_3.2/pm-cleanup-2' of git://github.com/khilman/linux-omap-pm into fixes

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;