From: Rikard Olsson Date: Mon, 3 Jan 2011 13:30:41 +0000 (+0100) Subject: plat-nomadik: change sleep/wakeup setting in GPIO SLPM register X-Git-Tag: v2.6.39-rc1~434^2~2^2~7 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b40eeeadc5837c2c01329aa1294e4bef3b35429;p=karo-tx-linux.git 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 Signed-off-by: Linus Walleij --- 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); }