]> git.karo-electronics.de Git - linux-beck.git/commitdiff
plat-nomadik: change sleep/wakeup setting in GPIO SLPM register
authorRikard Olsson <rikard.p.olsson@stericsson.com>
Mon, 3 Jan 2011 13:30:41 +0000 (14:30 +0100)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 14 Mar 2011 13:05:16 +0000 (14:05 +0100)
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>
arch/arm/plat-nomadik/gpio.c

index 9f1b720562702bf7bbe584020de55ab44fde8184..acc9de213246bff0dffbdce3aadac29388b10423 100644 (file)
@@ -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);
        }