4 files changed, 164 insertions, 0 deletions

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 363498697c2c..6778f56a4c64 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -280,6 +280,12 @@ config GPIO_TC3589X
           This enables support for the GPIOs found on the TC3589X
           I/O Expander.
 
+config GPIO_TPS65912
+        tristate "TI TPS65912 GPIO"
+        depends on (MFD_TPS65912_I2C || MFD_TPS65912_SPI)
+        help
+          This driver supports TPS65912 gpio chip
+
 config GPIO_TWL4030
         tristate "TWL4030, TWL5030, and TPS659x0 GPIOs"
         depends on TWL4030_CORE
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 720711251391..4b81d4e1e709 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -48,6 +48,7 @@ obj-$(CONFIG_GPIO_TC3589X)	+= gpio-tc3589x.o
 obj-$(CONFIG_ARCH_TEGRA)        += gpio-tegra.o
 obj-$(CONFIG_GPIO_TIMBERDALE)   += gpio-timberdale.o
 obj-$(CONFIG_GPIO_TPS65910)     += gpio-tps65910.o
+obj-$(CONFIG_GPIO_TPS65912)     += gpio-tps65912.o
 obj-$(CONFIG_GPIO_TWL4030)      += gpio-twl4030.o
 obj-$(CONFIG_MACH_U300)         += gpio-u300.o
 obj-$(CONFIG_GPIO_UCB1400)      += gpio-ucb1400.o
diff --git a/drivers/gpio/gpio-tps65912.c b/drivers/gpio/gpio-tps65912.c
new file mode 100644
index 000000000000..79e66c002350
--- /dev/null
+++ b/drivers/gpio/gpio-tps65912.c
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2011 Texas Instruments Inc.
+ *
+ * Author: Margarita Olaya <magi@slimlogic.co.uk>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under  the terms of the GNU General  Public License as published by the
+ *  Free Software Foundation;  either version 2 of the License, or (at your
+ *  option) any later version.
+ *
+ * This driver is based on wm8350 implementation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/gpio.h>
+#include <linux/mfd/core.h>
+#include <linux/platform_device.h>
+#include <linux/seq_file.h>
+#include <linux/slab.h>
+#include <linux/mfd/tps65912.h>
+
+struct tps65912_gpio_data {
+        struct tps65912 *tps65912;
+        struct gpio_chip gpio_chip;
+};
+
+static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset)
+{
+        struct tps65912 *tps65912 = container_of(gc, struct tps65912, gpio);
+        int val;
+
+        val = tps65912_reg_read(tps65912, TPS65912_GPIO1 + offset);
+
+        if (val & GPIO_STS_MASK)
+                return 1;
+
+        return 0;
+}
+
+static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset,
+                              int value)
+{
+        struct tps65912 *tps65912 = container_of(gc, struct tps65912, gpio);
+
+        if (value)
+                tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset,
+                                                        GPIO_SET_MASK);
+        else
+                tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset,
+                                                                GPIO_SET_MASK);
+}
+
+static int tps65912_gpio_output(struct gpio_chip *gc, unsigned offset,
+                                int value)
+{
+        struct tps65912 *tps65912 = container_of(gc, struct tps65912, gpio);
+
+        /* Set the initial value */
+        tps65912_gpio_set(gc, offset, value);
+
+        return tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset,
+                                                                GPIO_CFG_MASK);
+}
+
+static int tps65912_gpio_input(struct gpio_chip *gc, unsigned offset)
+{
+        struct tps65912 *tps65912 = container_of(gc, struct tps65912, gpio);
+
+        return tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset,
+                                                                GPIO_CFG_MASK);
+
+}
+
+static struct gpio_chip template_chip = {
+        .label                  = "tps65912",
+        .owner                  = THIS_MODULE,
+        .direction_input        = tps65912_gpio_input,
+        .direction_output       = tps65912_gpio_output,
+        .get                    = tps65912_gpio_get,
+        .set                    = tps65912_gpio_set,
+        .can_sleep              = 1,
+        .ngpio                  = 5,
+        .base                   = -1,
+};
+
+static int __devinit tps65912_gpio_probe(struct platform_device *pdev)
+{
+        struct tps65912 *tps65912 = dev_get_drvdata(pdev->dev.parent);
+        struct tps65912_board *pdata = tps65912->dev->platform_data;
+        struct tps65912_gpio_data *tps65912_gpio;
+        int ret;
+
+        tps65912_gpio = kzalloc(sizeof(*tps65912_gpio), GFP_KERNEL);
+        if (tps65912_gpio == NULL)
+                return -ENOMEM;
+
+        tps65912_gpio->tps65912 = tps65912;
+        tps65912_gpio->gpio_chip = template_chip;
+        tps65912_gpio->gpio_chip.dev = &pdev->dev;
+        if (pdata && pdata->gpio_base)
+                tps65912_gpio->gpio_chip.base = pdata->gpio_base;
+
+        ret = gpiochip_add(&tps65912_gpio->gpio_chip);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to register gpiochip, %d\n", ret);
+                goto err;
+        }
+
+        platform_set_drvdata(pdev, tps65912_gpio);
+
+        return ret;
+
+err:
+        kfree(tps65912_gpio);
+        return ret;
+}
+
+static int __devexit tps65912_gpio_remove(struct platform_device *pdev)
+{
+        struct tps65912_gpio_data  *tps65912_gpio = platform_get_drvdata(pdev);
+        int ret;
+
+        ret = gpiochip_remove(&tps65912_gpio->gpio_chip);
+        if (ret == 0)
+                kfree(tps65912_gpio);
+
+        return ret;
+}
+
+static struct platform_driver tps65912_gpio_driver = {
+        .driver = {
+                .name = "tps65912-gpio",
+                .owner = THIS_MODULE,
+        },
+        .probe = tps65912_gpio_probe,
+        .remove = __devexit_p(tps65912_gpio_remove),
+};
+
+static int __init tps65912_gpio_init(void)
+{
+        return platform_driver_register(&tps65912_gpio_driver);
+}
+subsys_initcall(tps65912_gpio_init);
+
+static void __exit tps65912_gpio_exit(void)
+{
+        platform_driver_unregister(&tps65912_gpio_driver);
+}
+module_exit(tps65912_gpio_exit);
+
+MODULE_AUTHOR("Margarita Olaya Cabrera <magi@slimlogic.co.uk>");
+MODULE_DESCRIPTION("GPIO interface for TPS65912 PMICs");
+MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:tps65912-gpio");
diff --git a/include/linux/mfd/tps65912.h b/include/linux/mfd/tps65912.h
index be60fb23b583..aaceab402ec5 100644
--- a/include/linux/mfd/tps65912.h
+++ b/include/linux/mfd/tps65912.h
@@ -275,6 +275,7 @@ struct tps65912_board {
         int is_dcdc4_avs;
         int irq;
         int irq_base;
+        int gpio_base;
         struct regulator_init_data *tps65912_pmic_init_data;
 };