From cb212f26b7e74edc04dbbe2ded5f37fe3c3194ed Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 16 Nov 2009 17:21:56 +0000
Subject: [PATCH] --- yaml --- r: 176055 b: refs/heads/master c:
 dc0fb25c14e37f2ab843c2901743222f2be7f447 h: refs/heads/master i:   176053:
 0782d111a8a13af94667ad82aa351830bb81ad96   176051:
 50365328eeb8a023fe176a0b3c4b3574237dbde9   176047:
 25162695c7391bc32ae0d95816e1eaefd366498e v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/gpio/wm831x-gpio.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c371de9edea7..75ecbae0167a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecba96e6966174ccee47255c98b2091a739e1e45
+refs/heads/master: dc0fb25c14e37f2ab843c2901743222f2be7f447
diff --git a/trunk/drivers/gpio/wm831x-gpio.c b/trunk/drivers/gpio/wm831x-gpio.c
index f5e4934f1da1..b4468b616890 100644
--- a/trunk/drivers/gpio/wm831x-gpio.c
+++ b/trunk/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,
 };