summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@stericsson.com>2012-06-12 12:43:06 +0200
committerLinus Walleij <linus.walleij@linaro.org>2012-06-12 13:35:24 +0200
commite85bbc19d5a9ad2b48bf8f2fd3277d6fe58f23ce (patch)
treeb6ce955e115144293730718e8b1b27df84c79e8c
parentefec381ced2c0416c3765abce076896cf464dc0c (diff)
downloadlinux-3.10-e85bbc19d5a9ad2b48bf8f2fd3277d6fe58f23ce.tar.gz
linux-3.10-e85bbc19d5a9ad2b48bf8f2fd3277d6fe58f23ce.tar.bz2
linux-3.10-e85bbc19d5a9ad2b48bf8f2fd3277d6fe58f23ce.zip
pinctrl: nomadik: fix up typo
Commit a60b57eddaa8af6c02cf7bbeb58ebf82881f08ac "drivers/gpio: gpio-nomadik: Add support for irqdomains" changed GPIO offset calculations to have this form: (gpio % NMK_GPIO_PER_CHIP) except in this one place for setting sleep mode, where the conversion was all wrong, and instead mod:ing the GPIO with the IRQ base which does not make any sense. So fix this up so we can use sleepmode. Reviewed-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
-rw-r--r--drivers/pinctrl/pinctrl-nomadik.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index ba7122ff480..e8937e7e499 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -673,7 +673,7 @@ static void __nmk_gpio_set_wake(struct nmk_gpio_chip *nmk_chip,
* wakeup is anyhow controlled by the RIMSC and FIMSC registers.
*/
if (nmk_chip->sleepmode && on) {
- __nmk_gpio_set_slpm(nmk_chip, gpio % nmk_chip->chip.base,
+ __nmk_gpio_set_slpm(nmk_chip, gpio % NMK_GPIO_PER_CHIP,
NMK_GPIO_SLPM_WAKEUP_ENABLE);
}