diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-18 19:24:57 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2012-01-14 06:25:23 +0100 |
commit | f408c985cefc9b1d99bc099e1208dd7df3445aa5 (patch) | |
tree | 8413c8cf3d8b21bfed24f09726f5c07d87be9c40 /arch/arm/mach-sa1100/include/mach | |
parent | Merge branch 'gpio-for-grant' of git://sources.calxeda.com/kernel/linux into ... (diff) | |
download | linux-f408c985cefc9b1d99bc099e1208dd7df3445aa5.tar.xz linux-f408c985cefc9b1d99bc099e1208dd7df3445aa5.zip |
GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion
The existing gpio_to_irq() implementation on sa1100 only translates
validly for internal GPIOs. Since this sub-arch enables GPIOLIB
support, this results in buggy translations for non-internal GPIOs.
Get rid of the private gpio_to_irq() implementation, replacing it
with the .to_irq method in the sa1100 gpio chip instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/arm/mach-sa1100/include/mach')
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/gpio.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/include/mach/gpio.h b/arch/arm/mach-sa1100/include/mach/gpio.h index 703631887c94..a38fc4f54241 100644 --- a/arch/arm/mach-sa1100/include/mach/gpio.h +++ b/arch/arm/mach-sa1100/include/mach/gpio.h @@ -51,7 +51,4 @@ static inline void gpio_set_value(unsigned gpio, int value) #define gpio_cansleep __gpio_cansleep -#define gpio_to_irq(gpio) ((gpio < 11) ? (IRQ_GPIO0 + gpio) : \ - (IRQ_GPIO11 - 11 + gpio)) - #endif |