summaryrefslogtreecommitdiff
path: root/arch/arm/plat-nomadik
diff options
context:
space:
mode:
authorRikard Olsson <rikard.p.olsson@stericsson.com>2011-01-03 16:30:41 +0300
committerLinus Walleij <linus.walleij@linaro.org>2011-03-14 16:05:16 +0300
commit8b40eeeadc5837c2c01329aa1294e4bef3b35429 (patch)
treee79e46d943fc813d664b94237e3661ac81f883e9 /arch/arm/plat-nomadik
parent01727e61f0967dd18fadd9dfcee5cf1246e6d8a6 (diff)
downloadlinux-8b40eeeadc5837c2c01329aa1294e4bef3b35429.tar.xz
plat-nomadik: change sleep/wakeup setting in GPIO SLPM register
This patch fixes a bug when setting SLPM register for DB8500. When calling__nmk_gpio_set_slpm(...) offset to GPIO is now used instead of the GPIO number itself. Signed-off-by: Rikard Olsson <rikard.p.olsson@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/plat-nomadik')
-rw-r--r--arch/arm/plat-nomadik/gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
index 9f1b72056270..acc9de213246 100644
--- a/arch/arm/plat-nomadik/gpio.c
+++ b/arch/arm/plat-nomadik/gpio.c
@@ -602,7 +602,7 @@ static int nmk_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
#ifdef CONFIG_ARCH_U8500
if (cpu_is_u8500v2()) {
- __nmk_gpio_set_slpm(nmk_chip, gpio,
+ __nmk_gpio_set_slpm(nmk_chip, gpio - nmk_chip->chip.base,
on ? NMK_GPIO_SLPM_WAKEUP_ENABLE
: NMK_GPIO_SLPM_WAKEUP_DISABLE);
}