From: Ben Dooks <ben-linux@fluff.org>
Date: Sat, 13 Dec 2008 20:44:13 +0000 (+0000)
Subject: [ARM] KS8695: Add GPIO to IRQ mapping function
X-Git-Tag: v2.6.29-rc1~559^2~24
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=7ef71320eba8933275be10bfa44e083bec95b3f1;p=safe%2Fjmp%2Flinux-2.6

[ARM] KS8695: Add GPIO to IRQ mapping function

Use the GPIOlib .to_irq call to map KS8695 GPIOs
to the relevant IRQ line.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---

diff --git a/arch/arm/mach-ks8695/gpio.c b/arch/arm/mach-ks8695/gpio.c
index 26d6346..55fbf71 100644
--- a/arch/arm/mach-ks8695/gpio.c
+++ b/arch/arm/mach-ks8695/gpio.c
@@ -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.
@@ -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,
diff --git a/arch/arm/mach-ks8695/include/mach/gpio.h b/arch/arm/mach-ks8695/include/mach/gpio.h
index 6379f2f..86312d4 100644
--- a/arch/arm/mach-ks8695/include/mach/gpio.h
+++ b/arch/arm/mach-ks8695/include/mach/gpio.h
@@ -36,11 +36,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.
  */
 extern int irq_to_gpio(unsigned int irq);
@@ -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);