diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 03:27:12 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2010-08-11 03:27:12 -0400 |
commit | f9baa031dd6bedc6d4b39e254e3b76cd2c37769b (patch) | |
tree | 216e51a0dc73b76f8e7be6648ecf4ee7dbbceec1 /arch/arm/plat-omap/gpio.c | |
parent | 21ee0ab5fa80eb7307079e1a126f642fe7a937a6 (diff) | |
parent | d21872b3683ff37f73c68993749a6e6aeeaed265 (diff) |
Merge commit 'd21872b'linaro_merge_100811
Diffstat (limited to 'arch/arm/plat-omap/gpio.c')
-rw-r--r-- | arch/arm/plat-omap/gpio.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 9b7e3545f32..7951eefe1a0 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -390,7 +390,9 @@ static inline int gpio_valid(int gpio) return 0; if (cpu_is_omap7xx() && gpio < 192) return 0; - if (cpu_is_omap24xx() && gpio < 128) + if (cpu_is_omap2420() && gpio < 128) + return 0; + if (cpu_is_omap2430() && gpio < 160) return 0; if ((cpu_is_omap34xx() || cpu_is_omap44xx()) && gpio < 192) return 0; |