diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2011-08-22 03:43:04 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-22 04:12:56 -0400 |
commit | 257af9f9725aa8a863b306659208a031135d59e7 (patch) | |
tree | ecd200084aff34e820fc242f8a2996d3cb45c9ad /arch/arm/mach-ep93xx | |
parent | 5f3fcf9649dbb010ccac41259d04147775ec8fc2 (diff) |
ARM: 7041/1: gpio-ep93xx: hookup the to_irq callback in the driver
Remove the ep93xx machine specific dependencies for gpio_to_irq() by
hooking up the callback in the driver and using __gpio_to_irq.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ep93xx')
-rw-r--r-- | arch/arm/mach-ep93xx/include/mach/gpio.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/gpio.h b/arch/arm/mach-ep93xx/include/mach/gpio.h index 071f676c6e09..76c68faca943 100644 --- a/arch/arm/mach-ep93xx/include/mach/gpio.h +++ b/arch/arm/mach-ep93xx/include/mach/gpio.h | |||
@@ -99,14 +99,7 @@ | |||
99 | /* maximum value for irq capable line identifiers */ | 99 | /* maximum value for irq capable line identifiers */ |
100 | #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) | 100 | #define EP93XX_GPIO_LINE_MAX_IRQ EP93XX_GPIO_LINE_F(7) |
101 | 101 | ||
102 | /* | 102 | #define gpio_to_irq __gpio_to_irq |
103 | * Map GPIO A0..A7 (0..7) to irq 64..71, | ||
104 | * B0..B7 (7..15) to irq 72..79, and | ||
105 | * F0..F7 (16..24) to irq 80..87. | ||
106 | */ | ||
107 | #define gpio_to_irq(gpio) \ | ||
108 | (((gpio) <= EP93XX_GPIO_LINE_MAX_IRQ) ? (64 + (gpio)) : -EINVAL) | ||
109 | |||
110 | #define irq_to_gpio(irq) ((irq) - gpio_to_irq(0)) | 103 | #define irq_to_gpio(irq) ((irq) - gpio_to_irq(0)) |
111 | 104 | ||
112 | #endif | 105 | #endif |