nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

GPIO: sa1100: implement proper gpiolib gpio_to_irq conversion

Browse source 
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>
This commit is contained in:
Russell King 2011-12-18 18:24:57 +00:00 committed by Grant Likely
parent fda87903f4
commit f408c985ce
2 changed files with 6 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-sa1100/include/mach/gpio.h
View file

@ -51,7 +51,4 @@ static inline void gpio_set_value(unsigned gpio, int value)
#define gpio_cansleep __gpio_cansleep #define gpio_cansleep __gpio_cansleep
#define gpio_to_irq(gpio) ((gpio < 11) ? (IRQ_GPIO0 + gpio) : \
(IRQ_GPIO11 - 11 + gpio))
#endif #endif

6
drivers/gpio/gpio-sa1100.c
View file

@ -47,12 +47,18 @@ static int sa1100_direction_output(struct gpio_chip *chip, unsigned offset, int
return 0; return 0;
} }
static int sa1100_to_irq(struct gpio_chip *chip, unsigned offset)
{
return offset < 11 ? (IRQ_GPIO0 + offset) : (IRQ_GPIO11 - 11 + offset);
}
static struct gpio_chip sa1100_gpio_chip = { static struct gpio_chip sa1100_gpio_chip = {
.label = "gpio", .label = "gpio",
.direction_input = sa1100_direction_input, .direction_input = sa1100_direction_input,
.direction_output = sa1100_direction_output, .direction_output = sa1100_direction_output,
.set = sa1100_gpio_set, .set = sa1100_gpio_set,
.get = sa1100_gpio_get, .get = sa1100_gpio_get,
.to_irq = sa1100_to_irq,
.base = 0, .base = 0,
.ngpio = GPIO_MAX + 1, .ngpio = GPIO_MAX + 1,
}; };