3 files changed, 34 insertions, 39 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 48f49d93d249..3d2565441b36 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -95,7 +95,7 @@ config GPIO_MAX732X
           number for these GPIOs.
 
 config GPIO_PCA953X
-        tristate "PCA953x, PCA955x, and MAX7310 I/O ports"
+        tristate "PCA953x, PCA955x, TCA64xx, and MAX7310 I/O ports"
         depends on I2C
         help
           Say yes here to provide access to several register-oriented
@@ -104,9 +104,10 @@ config GPIO_PCA953X
 
           4 bits:       pca9536, pca9537
 
-          8 bits:       max7310, pca9534, pca9538, pca9554, pca9557
+          8 bits:       max7310, pca9534, pca9538, pca9554, pca9557,
+                        tca6408
 
-          16 bits:      pca9535, pca9539, pca9555
+          16 bits:      pca9535, pca9539, pca9555, tca6416
 
           This driver can also be built as a module.  If so, the module
           will be called pca953x.
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index 9ceeb89f1325..37f35388a2ae 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -33,7 +33,12 @@ static const struct i2c_device_id pca953x_id[] = {
         { "pca9554", 8, },
         { "pca9555", 16, },
         { "pca9557", 8, },
+
         { "max7310", 8, },
+        { "pca6107", 8, },
+        { "tca6408", 8, },
+        { "tca6416", 16, },
+        /* NYET:  { "tca6424", 24, }, */
         { }
 };
 MODULE_DEVICE_TABLE(i2c, pca953x_id);
@@ -47,9 +52,6 @@ struct pca953x_chip {
         struct gpio_chip gpio_chip;
 };
 
-/* NOTE:  we can't currently rely on fault codes to come from SMBus
- * calls, so we map all errors to EIO here and return zero otherwise.
- */
 static int pca953x_write_reg(struct pca953x_chip *chip, int reg, uint16_t val)
 {
         int ret;
@@ -61,7 +63,7 @@ static int pca953x_write_reg(struct pca953x_chip *chip, int reg, uint16_t val)
 
         if (ret < 0) {
                 dev_err(&chip->client->dev, "failed writing register\n");
-                return -EIO;
+                return ret;
         }
 
         return 0;
@@ -78,7 +80,7 @@ static int pca953x_read_reg(struct pca953x_chip *chip, int reg, uint16_t *val)
 
         if (ret < 0) {
                 dev_err(&chip->client->dev, "failed reading register\n");
-                return -EIO;
+                return ret;
         }
 
         *val = (uint16_t)ret;
diff --git a/drivers/gpio/twl4030-gpio.c b/drivers/gpio/twl4030-gpio.c
index 37d3eec8730a..afad14792141 100644
--- a/drivers/gpio/twl4030-gpio.c
+++ b/drivers/gpio/twl4030-gpio.c
@@ -202,37 +202,6 @@ static int twl4030_get_gpio_datain(int gpio)
         return ret;
 }
 
-/*
- * Configure debounce timing value for a GPIO pin on TWL4030
- */
-int twl4030_set_gpio_debounce(int gpio, int enable)
-{
-        u8 d_bnk = gpio >> 3;
-        u8 d_msk = BIT(gpio & 0x7);
-        u8 reg = 0;
-        u8 base = 0;
-        int ret = 0;
-
-        if (unlikely((gpio >= TWL4030_GPIO_MAX)
-                || !(gpio_usage_count & BIT(gpio))))
-                return -EPERM;
-
-        base = REG_GPIO_DEBEN1 + d_bnk;
-        mutex_lock(&gpio_lock);
-        ret = gpio_twl4030_read(base);
-        if (ret >= 0) {
-                if (enable)
-                        reg = ret | d_msk;
-                else
-                        reg = ret & ~d_msk;
-
-                ret = gpio_twl4030_write(base, reg);
-        }
-        mutex_unlock(&gpio_lock);
-        return ret;
-}
-EXPORT_SYMBOL(twl4030_set_gpio_debounce);
-
 /*----------------------------------------------------------------------*/
 
 static int twl_request(struct gpio_chip *chip, unsigned offset)
@@ -405,6 +374,23 @@ static int __devinit gpio_twl4030_pulls(u32 ups, u32 downs)
                                 REG_GPIOPUPDCTR1, 5);
 }
 
+static int __devinit gpio_twl4030_debounce(u32 debounce, u8 mmc_cd)
+{
+        u8              message[4];
+
+        /* 30 msec of debouncing is always used for MMC card detect,
+         * and is optional for everything else.
+         */
+        message[1] = (debounce & 0xff) | (mmc_cd & 0x03);
+        debounce >>= 8;
+        message[2] = (debounce & 0xff);
+        debounce >>= 8;
+        message[3] = (debounce & 0x03);
+
+        return twl4030_i2c_write(TWL4030_MODULE_GPIO, message,
+                                REG_GPIO_DEBEN1, 3);
+}
+
 static int gpio_twl4030_remove(struct platform_device *pdev);
 
 static int __devinit gpio_twl4030_probe(struct platform_device *pdev)
@@ -439,6 +425,12 @@ no_irqs:
                                 pdata->pullups, pdata->pulldowns,
                                 ret);
 
+        ret = gpio_twl4030_debounce(pdata->debounce, pdata->mmc_cd);
+        if (ret)
+                dev_dbg(&pdev->dev, "debounce %.03x %.01x --> %d\n",
+                                pdata->debounce, pdata->mmc_cd,
+                                ret);
+
         twl_gpiochip.base = pdata->gpio_base;
         twl_gpiochip.ngpio = TWL4030_GPIO_MAX;
         twl_gpiochip.dev = &pdev->dev;