git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for_3.2/pm-cleanup-2' of git://github.com/khilman/linux-omap-pm into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
id.c
diff --git
a/arch/arm/mach-omap2/id.c
b/arch/arm/mach-omap2/id.c
index
d27daf9
..
7f47092
100644
(file)
--- 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;
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;
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;
omap_features |= OMAP3_HAS_SDRC;