3 files changed, 44 insertions, 29 deletions

diff --git a/drivers/gpio/adp5520-gpio.c b/drivers/gpio/adp5520-gpio.c
index ad05bbc7ffd5..0f93105873cd 100644
--- a/drivers/gpio/adp5520-gpio.c
+++ b/drivers/gpio/adp5520-gpio.c
@@ -34,9 +34,9 @@ static int adp5520_gpio_get_value(struct gpio_chip *chip, unsigned off)
          */
 
         if (test_bit(off, &dev->output))
-                adp5520_read(dev->master, GPIO_OUT, &reg_val);
+                adp5520_read(dev->master, ADP5520_GPIO_OUT, &reg_val);
         else
-                adp5520_read(dev->master, GPIO_IN, &reg_val);
+                adp5520_read(dev->master, ADP5520_GPIO_IN, &reg_val);
 
         return !!(reg_val & dev->lut[off]);
 }
@@ -48,9 +48,9 @@ static void adp5520_gpio_set_value(struct gpio_chip *chip,
         dev = container_of(chip, struct adp5520_gpio, gpio_chip);
 
         if (val)
-                adp5520_set_bits(dev->master, GPIO_OUT, dev->lut[off]);
+                adp5520_set_bits(dev->master, ADP5520_GPIO_OUT, dev->lut[off]);
         else
-                adp5520_clr_bits(dev->master, GPIO_OUT, dev->lut[off]);
+                adp5520_clr_bits(dev->master, ADP5520_GPIO_OUT, dev->lut[off]);
 }
 
 static int adp5520_gpio_direction_input(struct gpio_chip *chip, unsigned off)
@@ -60,7 +60,8 @@ static int adp5520_gpio_direction_input(struct gpio_chip *chip, unsigned off)
 
         clear_bit(off, &dev->output);
 
-        return adp5520_clr_bits(dev->master, GPIO_CFG_2, dev->lut[off]);
+        return adp5520_clr_bits(dev->master, ADP5520_GPIO_CFG_2,
+                                dev->lut[off]);
 }
 
 static int adp5520_gpio_direction_output(struct gpio_chip *chip,
@@ -73,18 +74,21 @@ static int adp5520_gpio_direction_output(struct gpio_chip *chip,
         set_bit(off, &dev->output);
 
         if (val)
-                ret |= adp5520_set_bits(dev->master, GPIO_OUT, dev->lut[off]);
+                ret |= adp5520_set_bits(dev->master, ADP5520_GPIO_OUT,
+                                        dev->lut[off]);
         else
-                ret |= adp5520_clr_bits(dev->master, GPIO_OUT, dev->lut[off]);
+                ret |= adp5520_clr_bits(dev->master, ADP5520_GPIO_OUT,
+                                        dev->lut[off]);
 
-        ret |= adp5520_set_bits(dev->master, GPIO_CFG_2, dev->lut[off]);
+        ret |= adp5520_set_bits(dev->master, ADP5520_GPIO_CFG_2,
+                                        dev->lut[off]);
 
         return ret;
 }
 
 static int __devinit adp5520_gpio_probe(struct platform_device *pdev)
 {
-        struct adp5520_gpio_platfrom_data *pdata = pdev->dev.platform_data;
+        struct adp5520_gpio_platform_data *pdata = pdev->dev.platform_data;
         struct adp5520_gpio *dev;
         struct gpio_chip *gc;
         int ret, i, gpios;
@@ -129,20 +133,20 @@ static int __devinit adp5520_gpio_probe(struct platform_device *pdev)
         gc->label = pdev->name;
         gc->owner = THIS_MODULE;
 
-        ret = adp5520_clr_bits(dev->master, GPIO_CFG_1,
+        ret = adp5520_clr_bits(dev->master, ADP5520_GPIO_CFG_1,
                 pdata->gpio_en_mask);
 
-        if (pdata->gpio_en_mask & GPIO_C3)
-                ctl_mask |= C3_MODE;
+        if (pdata->gpio_en_mask & ADP5520_GPIO_C3)
+                ctl_mask |= ADP5520_C3_MODE;
 
-        if (pdata->gpio_en_mask & GPIO_R3)
-                ctl_mask |= R3_MODE;
+        if (pdata->gpio_en_mask & ADP5520_GPIO_R3)
+                ctl_mask |= ADP5520_R3_MODE;
 
         if (ctl_mask)
-                ret = adp5520_set_bits(dev->master, LED_CONTROL,
+                ret = adp5520_set_bits(dev->master, ADP5520_LED_CONTROL,
                         ctl_mask);
 
-        ret |= adp5520_set_bits(dev->master, GPIO_PULLUP,
+        ret |= adp5520_set_bits(dev->master, ADP5520_GPIO_PULLUP,
                 pdata->gpio_pullup_mask);
 
         if (ret) {
diff --git a/drivers/gpio/twl4030-gpio.c b/drivers/gpio/twl4030-gpio.c
index 49384a7c5492..7fe881e2bdfb 100644
--- a/drivers/gpio/twl4030-gpio.c
+++ b/drivers/gpio/twl4030-gpio.c
@@ -34,7 +34,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 
-#include <linux/i2c/twl4030.h>
+#include <linux/i2c/twl.h>
 
 
 /*
@@ -80,7 +80,7 @@ static unsigned int gpio_usage_count;
  */
 static inline int gpio_twl4030_write(u8 address, u8 data)
 {
-        return twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, data, address);
+        return twl_i2c_write_u8(TWL4030_MODULE_GPIO, data, address);
 }
 
 /*----------------------------------------------------------------------*/
@@ -117,7 +117,7 @@ static inline int gpio_twl4030_read(u8 address)
         u8 data;
         int ret = 0;
 
-        ret = twl4030_i2c_read_u8(TWL4030_MODULE_GPIO, &data, address);
+        ret = twl_i2c_read_u8(TWL4030_MODULE_GPIO, &data, address);
         return (ret < 0) ? ret : data;
 }
 
@@ -142,7 +142,7 @@ static void twl4030_led_set_value(int led, int value)
                 cached_leden &= ~mask;
         else
                 cached_leden |= mask;
-        status = twl4030_i2c_write_u8(TWL4030_MODULE_LED, cached_leden,
+        status = twl_i2c_write_u8(TWL4030_MODULE_LED, cached_leden,
                         TWL4030_LED_LEDEN);
         mutex_unlock(&gpio_lock);
 }
@@ -223,23 +223,23 @@ static int twl_request(struct gpio_chip *chip, unsigned offset)
                 }
 
                 /* initialize PWM to always-drive */
-                status = twl4030_i2c_write_u8(module, 0x7f,
+                status = twl_i2c_write_u8(module, 0x7f,
                                 TWL4030_PWMx_PWMxOFF);
                 if (status < 0)
                         goto done;
-                status = twl4030_i2c_write_u8(module, 0x7f,
+                status = twl_i2c_write_u8(module, 0x7f,
                                 TWL4030_PWMx_PWMxON);
                 if (status < 0)
                         goto done;
 
                 /* init LED to not-driven (high) */
                 module = TWL4030_MODULE_LED;
-                status = twl4030_i2c_read_u8(module, &cached_leden,
+                status = twl_i2c_read_u8(module, &cached_leden,
                                 TWL4030_LED_LEDEN);
                 if (status < 0)
                         goto done;
                 cached_leden &= ~ledclr_mask;
-                status = twl4030_i2c_write_u8(module, cached_leden,
+                status = twl_i2c_write_u8(module, cached_leden,
                                 TWL4030_LED_LEDEN);
                 if (status < 0)
                         goto done;
@@ -370,7 +370,7 @@ static int __devinit gpio_twl4030_pulls(u32 ups, u32 downs)
                 message[i] = bit_mask;
         }
 
-        return twl4030_i2c_write(TWL4030_MODULE_GPIO, message,
+        return twl_i2c_write(TWL4030_MODULE_GPIO, message,
                                 REG_GPIOPUPDCTR1, 5);
 }
 
@@ -387,7 +387,7 @@ static int __devinit gpio_twl4030_debounce(u32 debounce, u8 mmc_cd)
         debounce >>= 8;
         message[3] = (debounce & 0x03);
 
-        return twl4030_i2c_write(TWL4030_MODULE_GPIO, message,
+        return twl_i2c_write(TWL4030_MODULE_GPIO, message,
                                 REG_GPIO_DEBEN1, 3);
 }
 
diff --git a/drivers/gpio/wm831x-gpio.c b/drivers/gpio/wm831x-gpio.c
index f9c09a54ec7f..b4468b616890 100644
--- a/drivers/gpio/wm831x-gpio.c
+++ b/drivers/gpio/wm831x-gpio.c
@@ -22,8 +22,7 @@
 #include <linux/mfd/wm831x/core.h>
 #include <linux/mfd/wm831x/pdata.h>
 #include <linux/mfd/wm831x/gpio.h>
-
-#define WM831X_GPIO_MAX 16
+#include <linux/mfd/wm831x/irq.h>
 
 struct wm831x_gpio {
         struct wm831x *wm831x;
@@ -80,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)
 {
@@ -175,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,
 };
@@ -192,7 +203,7 @@ static int __devinit wm831x_gpio_probe(struct platform_device *pdev)
 
         wm831x_gpio->wm831x = wm831x;
         wm831x_gpio->gpio_chip = template_chip;
-        wm831x_gpio->gpio_chip.ngpio = WM831X_GPIO_MAX;
+        wm831x_gpio->gpio_chip.ngpio = wm831x->num_gpio;
         wm831x_gpio->gpio_chip.dev = &pdev->dev;
         if (pdata && pdata->gpio_base)
                 wm831x_gpio->gpio_chip.base = pdata->gpio_base;