diff options
| author | Mark Brown | 2011-10-26 09:51:55 +0200 |
|---|---|---|
| committer | Greg Ungerer | 2011-12-24 12:47:56 +0100 |
| commit | d85b40948654dee3be1d8e43b0fce511c1b42d78 (patch) | |
| tree | 27788571779ee84ddded7da9705cbd035a0f7d71 /arch | |
| parent | clocksource: m86k: Convert to clocksource_register_hz/khz (diff) | |
| download | kernel-qcow2-linux-d85b40948654dee3be1d8e43b0fce511c1b42d78.tar.gz kernel-qcow2-linux-d85b40948654dee3be1d8e43b0fce511c1b42d78.tar.xz kernel-qcow2-linux-d85b40948654dee3be1d8e43b0fce511c1b42d78.zip | |
m68k: Fall back to __gpio_to_irq() for non-arch GPIOs
gpiolib provides __gpio_to_irq() to map gpiolib gpios to interrupts - hook
that up on m68k.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/m68k/include/asm/gpio.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/include/asm/gpio.h b/arch/m68k/include/asm/gpio.h index b2046839f4b2..00d0071de4c3 100644 --- a/arch/m68k/include/asm/gpio.h +++ b/arch/m68k/include/asm/gpio.h @@ -225,7 +225,8 @@ static inline void gpio_set_value(unsigned gpio, int value) static inline int gpio_to_irq(unsigned gpio) { - return (gpio < MCFGPIO_IRQ_MAX) ? gpio + MCFGPIO_IRQ_VECBASE : -EINVAL; + return (gpio < MCFGPIO_IRQ_MAX) ? gpio + MCFGPIO_IRQ_VECBASE + : __gpio_to_irq(gpio); } static inline int irq_to_gpio(unsigned irq) |