Skip to content

Commit

Permalink
[ARM] KS8695: Add GPIO to IRQ mapping function
Browse files Browse the repository at this point in the history
Use the GPIOlib .to_irq call to map KS8695 GPIOs
to the relevant IRQ line.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
  • Loading branch information
Ben Dooks committed Dec 14, 2008
1 parent 72880ad commit 7ef7132
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
5 changes: 2 additions & 3 deletions arch/arm/mach-ks8695/gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -197,15 +197,13 @@ static int ks8695_gpio_get_value(struct gpio_chip *gc, unsigned int pin)
/*
* Map GPIO line to IRQ number.
*/
int gpio_to_irq(unsigned int pin)
static int ks8695_gpio_to_irq(struct gpio_chip *gc, unsigned int pin)
{
if (pin > KS8695_GPIO_3) /* only GPIO 0..3 can generate IRQ */
return -EINVAL;

return gpio_irq[pin];
}
EXPORT_SYMBOL(gpio_to_irq);


/*
* Map IRQ number to GPIO line.
Expand All @@ -227,6 +225,7 @@ static struct gpio_chip ks8695_gpio_chip = {
.direction_output = ks8695_gpio_direction_output,
.get = ks8695_gpio_get_value,
.set = ks8695_gpio_set_value,
.to_irq = ks8695_gpio_to_irq,
.base = 0,
.ngpio = 16,
.can_sleep = 0,
Expand Down
6 changes: 1 addition & 5 deletions arch/arm/mach-ks8695/include/mach/gpio.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@
*/
extern int ks8695_gpio_interrupt(unsigned int pin, unsigned int type);

/*
* Map GPIO line to IRQ number.
*/
extern int gpio_to_irq(unsigned int pin);

/*
* Map IRQ number to GPIO line.
*/
Expand All @@ -54,6 +49,7 @@ extern int irq_to_gpio(unsigned int irq);
*/
#define gpio_get_value __gpio_get_value
#define gpio_set_value __gpio_set_value
#define gpio_to_irq __gpio_to_irq

/* Register the GPIOs */
extern void ks8695_register_gpios(void);
Expand Down

0 comments on commit 7ef7132

Please sign in to comment.