diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 04:47:44 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 04:47:44 -0400 |
| commit | 9dd056e9eba106ef622795b566f769a9ab0a49a8 (patch) | |
| tree | 390c07ea2c3b9631c2e8fe64c1a6feba0b503e8b /drivers/gpio/gpio-omap.c | |
| parent | 08ef2e427b59393d68a65b16e97e894b662a5573 (diff) | |
| parent | f2b9726105824fdeea32a339e5072a358f89a25b (diff) | |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'drivers/gpio/gpio-omap.c')
| -rw-r--r-- | drivers/gpio/gpio-omap.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index 01f74a8459d9..35bebde23e83 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c | |||
| @@ -469,8 +469,9 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio, | |||
| 469 | + OMAP24XX_GPIO_CLEARWKUENA); | 469 | + OMAP24XX_GPIO_CLEARWKUENA); |
| 470 | } | 470 | } |
| 471 | } | 471 | } |
| 472 | /* This part needs to be executed always for OMAP34xx */ | 472 | /* This part needs to be executed always for OMAP{34xx, 44xx} */ |
| 473 | if (cpu_is_omap34xx() || (bank->non_wakeup_gpios & gpio_bit)) { | 473 | if (cpu_is_omap34xx() || cpu_is_omap44xx() || |
| 474 | (bank->non_wakeup_gpios & gpio_bit)) { | ||
| 474 | /* | 475 | /* |
| 475 | * Log the edge gpio and manually trigger the IRQ | 476 | * Log the edge gpio and manually trigger the IRQ |
| 476 | * after resume if the input level changes | 477 | * after resume if the input level changes |