[PATCH] gpiolib: Implement gpio_to_irq() for wm831x

[PATCH] gpiolib: Implement gpio_to_irq() for wm831x

[Mark Brown]

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 drivers/gpio/wm831x-gpio.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/drivers/gpio/wm831x-gpio.c b/drivers/gpio/wm831x-gpio.c
index f5e4934..b4468b6 100644
--- a/drivers/gpio/wm831x-gpio.c
+++ b/drivers/gpio/wm831x-gpio.c
@@ -22,6 +22,7 @@
 #include <linux/mfd/wm831x/core.h>
 #include <linux/mfd/wm831x/pdata.h>
 #include <linux/mfd/wm831x/gpio.h>
+#include <linux/mfd/wm831x/irq.h>
 
 struct wm831x_gpio {
 	struct wm831x *wm831x;
@@ -78,6 +79,17 @@ static void wm831x_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 			value << offset);
 }
 
+static int wm831x_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+	struct wm831x_gpio *wm831x_gpio = to_wm831x_gpio(chip);
+	struct wm831x *wm831x = wm831x_gpio->wm831x;
+
+	if (!wm831x->irq_base)
+		return -EINVAL;
+
+	return wm831x->irq_base + WM831X_IRQ_GPIO_1 + offset;
+}
+
 #ifdef CONFIG_DEBUG_FS
 static void wm831x_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
 {
@@ -173,6 +185,7 @@ static struct gpio_chip template_chip = {
 	.get			= wm831x_gpio_get,
 	.direction_output	= wm831x_gpio_direction_out,
 	.set			= wm831x_gpio_set,
+	.to_irq			= wm831x_gpio_to_irq,
 	.dbg_show		= wm831x_gpio_dbg_show,
 	.can_sleep		= 1,
 };
-- 
1.6.5.2

Re: [PATCH] gpiolib: Implement gpio_to_irq() for wm831x

[Samuel Ortiz]

Hi Mark,

On Mon, Nov 16, 2009 at 05:21:56PM +0000, Mark Brown wrote:
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
I'm taking this one, unless David wants to do it otherwise.

Cheers,
Samuel.


> ---
>  drivers/gpio/wm831x-gpio.c |   13 +++++++++++++
>  1 files changed, 13 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/gpio/wm831x-gpio.c b/drivers/gpio/wm831x-gpio.c
> index f5e4934..b4468b6 100644
> --- a/drivers/gpio/wm831x-gpio.c
> +++ b/drivers/gpio/wm831x-gpio.c
> @@ -22,6 +22,7 @@
>  #include <linux/mfd/wm831x/core.h>
>  #include <linux/mfd/wm831x/pdata.h>
>  #include <linux/mfd/wm831x/gpio.h>
> +#include <linux/mfd/wm831x/irq.h>
>  
>  struct wm831x_gpio {
>  	struct wm831x *wm831x;
> @@ -78,6 +79,17 @@ static void wm831x_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
>  			value << offset);
>  }
>  
> +static int wm831x_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
> +{
> +	struct wm831x_gpio *wm831x_gpio = to_wm831x_gpio(chip);
> +	struct wm831x *wm831x = wm831x_gpio->wm831x;
> +
> +	if (!wm831x->irq_base)
> +		return -EINVAL;
> +
> +	return wm831x->irq_base + WM831X_IRQ_GPIO_1 + offset;
> +}
> +
>  #ifdef CONFIG_DEBUG_FS
>  static void wm831x_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
>  {
> @@ -173,6 +185,7 @@ static struct gpio_chip template_chip = {
>  	.get			= wm831x_gpio_get,
>  	.direction_output	= wm831x_gpio_direction_out,
>  	.set			= wm831x_gpio_set,
> +	.to_irq			= wm831x_gpio_to_irq,
>  	.dbg_show		= wm831x_gpio_dbg_show,
>  	.can_sleep		= 1,
>  };
> -- 
> 1.6.5.2
> 

-- 
Intel Open Source Technology Centre
http://oss.intel.com/