]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
mfd/tc35892: rename tc35892 core driver to tc3589x
authorSundar Iyer <sundar.iyer@stericsson.com>
Mon, 13 Dec 2010 04:03:13 +0000 (09:33 +0530)
committerLinus Walleij <linus.walleij@stericsson.com>
Sun, 19 Dec 2010 18:27:42 +0000 (19:27 +0100)
Rename the tc35892 core/gpio drivers to tc3589x to include
new variants in the same mfd core

Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Sundar Iyer <sundar.iyer@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/tc35892-gpio.c [deleted file]
drivers/gpio/tc3589x-gpio.c [new file with mode: 0644]
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/mfd/tc35892.c [deleted file]
drivers/mfd/tc3589x.c [new file with mode: 0644]

index 3143ac795eb0c4d7031fc21b5e3d0ff476bca8ce..082495bb08a7064c9a8d37dc1dec96242d747d2f 100644 (file)
@@ -230,11 +230,11 @@ config GPIO_STMPE
          This enables support for the GPIOs found on the STMPE I/O
          Expanders.
 
-config GPIO_TC35892
-       bool "TC35892 GPIOs"
-       depends on MFD_TC35892
+config GPIO_TC3589X
+       bool "TC3589X GPIOs"
+       depends on MFD_TC3589X
        help
-         This enables support for the GPIOs found on the TC35892
+         This enables support for the GPIOs found on the TC3589X
          I/O Expander.
 
 config GPIO_TWL4030
index bdf3ddec06528074aa5953a8e0244805b799f5d5..39bfd7a37650992b12456c33f3300b203e40dd60 100644 (file)
@@ -24,7 +24,7 @@ obj-$(CONFIG_GPIO_PCF857X)    += pcf857x.o
 obj-$(CONFIG_GPIO_PCH)         += pch_gpio.o
 obj-$(CONFIG_GPIO_PL061)       += pl061.o
 obj-$(CONFIG_GPIO_STMPE)       += stmpe-gpio.o
-obj-$(CONFIG_GPIO_TC35892)     += tc35892-gpio.o
+obj-$(CONFIG_GPIO_TC3589X)     += tc3589x-gpio.o
 obj-$(CONFIG_GPIO_TIMBERDALE)  += timbgpio.o
 obj-$(CONFIG_GPIO_TWL4030)     += twl4030-gpio.o
 obj-$(CONFIG_GPIO_UCB1400)     += ucb1400_gpio.o
diff --git a/drivers/gpio/tc35892-gpio.c b/drivers/gpio/tc35892-gpio.c
deleted file mode 100644 (file)
index 027b857..0000000
+++ /dev/null
@@ -1,389 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License, version 2
- * Author: Hanumath Prasad <hanumath.prasad@stericsson.com> for ST-Ericsson
- * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/gpio.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/mfd/tc3589x.h>
-
-/*
- * These registers are modified under the irq bus lock and cached to avoid
- * unnecessary writes in bus_sync_unlock.
- */
-enum { REG_IBE, REG_IEV, REG_IS, REG_IE };
-
-#define CACHE_NR_REGS  4
-#define CACHE_NR_BANKS 3
-
-struct tc35892_gpio {
-       struct gpio_chip chip;
-       struct tc35892 *tc35892;
-       struct device *dev;
-       struct mutex irq_lock;
-
-       int irq_base;
-
-       /* Caches of interrupt control registers for bus_lock */
-       u8 regs[CACHE_NR_REGS][CACHE_NR_BANKS];
-       u8 oldregs[CACHE_NR_REGS][CACHE_NR_BANKS];
-};
-
-static inline struct tc35892_gpio *to_tc35892_gpio(struct gpio_chip *chip)
-{
-       return container_of(chip, struct tc35892_gpio, chip);
-}
-
-static int tc35892_gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-       struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
-       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-       u8 reg = TC35892_GPIODATA0 + (offset / 8) * 2;
-       u8 mask = 1 << (offset % 8);
-       int ret;
-
-       ret = tc35892_reg_read(tc35892, reg);
-       if (ret < 0)
-               return ret;
-
-       return ret & mask;
-}
-
-static void tc35892_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
-{
-       struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
-       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-       u8 reg = TC35892_GPIODATA0 + (offset / 8) * 2;
-       unsigned pos = offset % 8;
-       u8 data[] = {!!val << pos, 1 << pos};
-
-       tc35892_block_write(tc35892, reg, ARRAY_SIZE(data), data);
-}
-
-static int tc35892_gpio_direction_output(struct gpio_chip *chip,
-                                        unsigned offset, int val)
-{
-       struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
-       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-       u8 reg = TC35892_GPIODIR0 + offset / 8;
-       unsigned pos = offset % 8;
-
-       tc35892_gpio_set(chip, offset, val);
-
-       return tc35892_set_bits(tc35892, reg, 1 << pos, 1 << pos);
-}
-
-static int tc35892_gpio_direction_input(struct gpio_chip *chip,
-                                       unsigned offset)
-{
-       struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
-       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-       u8 reg = TC35892_GPIODIR0 + offset / 8;
-       unsigned pos = offset % 8;
-
-       return tc35892_set_bits(tc35892, reg, 1 << pos, 0);
-}
-
-static int tc35892_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
-{
-       struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
-
-       return tc35892_gpio->irq_base + offset;
-}
-
-static struct gpio_chip template_chip = {
-       .label                  = "tc35892",
-       .owner                  = THIS_MODULE,
-       .direction_input        = tc35892_gpio_direction_input,
-       .get                    = tc35892_gpio_get,
-       .direction_output       = tc35892_gpio_direction_output,
-       .set                    = tc35892_gpio_set,
-       .to_irq                 = tc35892_gpio_to_irq,
-       .can_sleep              = 1,
-};
-
-static int tc35892_gpio_irq_set_type(unsigned int irq, unsigned int type)
-{
-       struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
-       int offset = irq - tc35892_gpio->irq_base;
-       int regoffset = offset / 8;
-       int mask = 1 << (offset % 8);
-
-       if (type == IRQ_TYPE_EDGE_BOTH) {
-               tc35892_gpio->regs[REG_IBE][regoffset] |= mask;
-               return 0;
-       }
-
-       tc35892_gpio->regs[REG_IBE][regoffset] &= ~mask;
-
-       if (type == IRQ_TYPE_LEVEL_LOW || type == IRQ_TYPE_LEVEL_HIGH)
-               tc35892_gpio->regs[REG_IS][regoffset] |= mask;
-       else
-               tc35892_gpio->regs[REG_IS][regoffset] &= ~mask;
-
-       if (type == IRQ_TYPE_EDGE_RISING || type == IRQ_TYPE_LEVEL_HIGH)
-               tc35892_gpio->regs[REG_IEV][regoffset] |= mask;
-       else
-               tc35892_gpio->regs[REG_IEV][regoffset] &= ~mask;
-
-       return 0;
-}
-
-static void tc35892_gpio_irq_lock(unsigned int irq)
-{
-       struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
-
-       mutex_lock(&tc35892_gpio->irq_lock);
-}
-
-static void tc35892_gpio_irq_sync_unlock(unsigned int irq)
-{
-       struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
-       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-       static const u8 regmap[] = {
-               [REG_IBE]       = TC35892_GPIOIBE0,
-               [REG_IEV]       = TC35892_GPIOIEV0,
-               [REG_IS]        = TC35892_GPIOIS0,
-               [REG_IE]        = TC35892_GPIOIE0,
-       };
-       int i, j;
-
-       for (i = 0; i < CACHE_NR_REGS; i++) {
-               for (j = 0; j < CACHE_NR_BANKS; j++) {
-                       u8 old = tc35892_gpio->oldregs[i][j];
-                       u8 new = tc35892_gpio->regs[i][j];
-
-                       if (new == old)
-                               continue;
-
-                       tc35892_gpio->oldregs[i][j] = new;
-                       tc35892_reg_write(tc35892, regmap[i] + j * 8, new);
-               }
-       }
-
-       mutex_unlock(&tc35892_gpio->irq_lock);
-}
-
-static void tc35892_gpio_irq_mask(unsigned int irq)
-{
-       struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
-       int offset = irq - tc35892_gpio->irq_base;
-       int regoffset = offset / 8;
-       int mask = 1 << (offset % 8);
-
-       tc35892_gpio->regs[REG_IE][regoffset] &= ~mask;
-}
-
-static void tc35892_gpio_irq_unmask(unsigned int irq)
-{
-       struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
-       int offset = irq - tc35892_gpio->irq_base;
-       int regoffset = offset / 8;
-       int mask = 1 << (offset % 8);
-
-       tc35892_gpio->regs[REG_IE][regoffset] |= mask;
-}
-
-static struct irq_chip tc35892_gpio_irq_chip = {
-       .name                   = "tc35892-gpio",
-       .bus_lock               = tc35892_gpio_irq_lock,
-       .bus_sync_unlock        = tc35892_gpio_irq_sync_unlock,
-       .mask                   = tc35892_gpio_irq_mask,
-       .unmask                 = tc35892_gpio_irq_unmask,
-       .set_type               = tc35892_gpio_irq_set_type,
-};
-
-static irqreturn_t tc35892_gpio_irq(int irq, void *dev)
-{
-       struct tc35892_gpio *tc35892_gpio = dev;
-       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-       u8 status[CACHE_NR_BANKS];
-       int ret;
-       int i;
-
-       ret = tc35892_block_read(tc35892, TC35892_GPIOMIS0,
-                                ARRAY_SIZE(status), status);
-       if (ret < 0)
-               return IRQ_NONE;
-
-       for (i = 0; i < ARRAY_SIZE(status); i++) {
-               unsigned int stat = status[i];
-               if (!stat)
-                       continue;
-
-               while (stat) {
-                       int bit = __ffs(stat);
-                       int line = i * 8 + bit;
-
-                       handle_nested_irq(tc35892_gpio->irq_base + line);
-                       stat &= ~(1 << bit);
-               }
-
-               tc35892_reg_write(tc35892, TC35892_GPIOIC0 + i, status[i]);
-       }
-
-       return IRQ_HANDLED;
-}
-
-static int tc35892_gpio_irq_init(struct tc35892_gpio *tc35892_gpio)
-{
-       int base = tc35892_gpio->irq_base;
-       int irq;
-
-       for (irq = base; irq < base + tc35892_gpio->chip.ngpio; irq++) {
-               set_irq_chip_data(irq, tc35892_gpio);
-               set_irq_chip_and_handler(irq, &tc35892_gpio_irq_chip,
-                                        handle_simple_irq);
-               set_irq_nested_thread(irq, 1);
-#ifdef CONFIG_ARM
-               set_irq_flags(irq, IRQF_VALID);
-#else
-               set_irq_noprobe(irq);
-#endif
-       }
-
-       return 0;
-}
-
-static void tc35892_gpio_irq_remove(struct tc35892_gpio *tc35892_gpio)
-{
-       int base = tc35892_gpio->irq_base;
-       int irq;
-
-       for (irq = base; irq < base + tc35892_gpio->chip.ngpio; irq++) {
-#ifdef CONFIG_ARM
-               set_irq_flags(irq, 0);
-#endif
-               set_irq_chip_and_handler(irq, NULL, NULL);
-               set_irq_chip_data(irq, NULL);
-       }
-}
-
-static int __devinit tc35892_gpio_probe(struct platform_device *pdev)
-{
-       struct tc35892 *tc35892 = dev_get_drvdata(pdev->dev.parent);
-       struct tc35892_gpio_platform_data *pdata;
-       struct tc35892_gpio *tc35892_gpio;
-       int ret;
-       int irq;
-
-       pdata = tc35892->pdata->gpio;
-       if (!pdata)
-               return -ENODEV;
-
-       irq = platform_get_irq(pdev, 0);
-       if (irq < 0)
-               return irq;
-
-       tc35892_gpio = kzalloc(sizeof(struct tc35892_gpio), GFP_KERNEL);
-       if (!tc35892_gpio)
-               return -ENOMEM;
-
-       mutex_init(&tc35892_gpio->irq_lock);
-
-       tc35892_gpio->dev = &pdev->dev;
-       tc35892_gpio->tc35892 = tc35892;
-
-       tc35892_gpio->chip = template_chip;
-       tc35892_gpio->chip.ngpio = tc35892->num_gpio;
-       tc35892_gpio->chip.dev = &pdev->dev;
-       tc35892_gpio->chip.base = pdata->gpio_base;
-
-       tc35892_gpio->irq_base = tc35892->irq_base + TC35892_INT_GPIO(0);
-
-       /* Bring the GPIO module out of reset */
-       ret = tc35892_set_bits(tc35892, TC35892_RSTCTRL,
-                              TC35892_RSTCTRL_GPIRST, 0);
-       if (ret < 0)
-               goto out_free;
-
-       ret = tc35892_gpio_irq_init(tc35892_gpio);
-       if (ret)
-               goto out_free;
-
-       ret = request_threaded_irq(irq, NULL, tc35892_gpio_irq, IRQF_ONESHOT,
-                                  "tc35892-gpio", tc35892_gpio);
-       if (ret) {
-               dev_err(&pdev->dev, "unable to get irq: %d\n", ret);
-               goto out_removeirq;
-       }
-
-       ret = gpiochip_add(&tc35892_gpio->chip);
-       if (ret) {
-               dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
-               goto out_freeirq;
-       }
-
-       if (pdata->setup)
-               pdata->setup(tc35892, tc35892_gpio->chip.base);
-
-       platform_set_drvdata(pdev, tc35892_gpio);
-
-       return 0;
-
-out_freeirq:
-       free_irq(irq, tc35892_gpio);
-out_removeirq:
-       tc35892_gpio_irq_remove(tc35892_gpio);
-out_free:
-       kfree(tc35892_gpio);
-       return ret;
-}
-
-static int __devexit tc35892_gpio_remove(struct platform_device *pdev)
-{
-       struct tc35892_gpio *tc35892_gpio = platform_get_drvdata(pdev);
-       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
-       struct tc35892_gpio_platform_data *pdata = tc35892->pdata->gpio;
-       int irq = platform_get_irq(pdev, 0);
-       int ret;
-
-       if (pdata->remove)
-               pdata->remove(tc35892, tc35892_gpio->chip.base);
-
-       ret = gpiochip_remove(&tc35892_gpio->chip);
-       if (ret < 0) {
-               dev_err(tc35892_gpio->dev,
-                       "unable to remove gpiochip: %d\n", ret);
-               return ret;
-       }
-
-       free_irq(irq, tc35892_gpio);
-       tc35892_gpio_irq_remove(tc35892_gpio);
-
-       platform_set_drvdata(pdev, NULL);
-       kfree(tc35892_gpio);
-
-       return 0;
-}
-
-static struct platform_driver tc35892_gpio_driver = {
-       .driver.name    = "tc35892-gpio",
-       .driver.owner   = THIS_MODULE,
-       .probe          = tc35892_gpio_probe,
-       .remove         = __devexit_p(tc35892_gpio_remove),
-};
-
-static int __init tc35892_gpio_init(void)
-{
-       return platform_driver_register(&tc35892_gpio_driver);
-}
-subsys_initcall(tc35892_gpio_init);
-
-static void __exit tc35892_gpio_exit(void)
-{
-       platform_driver_unregister(&tc35892_gpio_driver);
-}
-module_exit(tc35892_gpio_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("TC35892 GPIO driver");
-MODULE_AUTHOR("Hanumath Prasad, Rabin Vincent");
diff --git a/drivers/gpio/tc3589x-gpio.c b/drivers/gpio/tc3589x-gpio.c
new file mode 100644 (file)
index 0000000..027b857
--- /dev/null
@@ -0,0 +1,389 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License Terms: GNU General Public License, version 2
+ * Author: Hanumath Prasad <hanumath.prasad@stericsson.com> for ST-Ericsson
+ * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/tc3589x.h>
+
+/*
+ * These registers are modified under the irq bus lock and cached to avoid
+ * unnecessary writes in bus_sync_unlock.
+ */
+enum { REG_IBE, REG_IEV, REG_IS, REG_IE };
+
+#define CACHE_NR_REGS  4
+#define CACHE_NR_BANKS 3
+
+struct tc35892_gpio {
+       struct gpio_chip chip;
+       struct tc35892 *tc35892;
+       struct device *dev;
+       struct mutex irq_lock;
+
+       int irq_base;
+
+       /* Caches of interrupt control registers for bus_lock */
+       u8 regs[CACHE_NR_REGS][CACHE_NR_BANKS];
+       u8 oldregs[CACHE_NR_REGS][CACHE_NR_BANKS];
+};
+
+static inline struct tc35892_gpio *to_tc35892_gpio(struct gpio_chip *chip)
+{
+       return container_of(chip, struct tc35892_gpio, chip);
+}
+
+static int tc35892_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+       struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
+       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
+       u8 reg = TC35892_GPIODATA0 + (offset / 8) * 2;
+       u8 mask = 1 << (offset % 8);
+       int ret;
+
+       ret = tc35892_reg_read(tc35892, reg);
+       if (ret < 0)
+               return ret;
+
+       return ret & mask;
+}
+
+static void tc35892_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
+{
+       struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
+       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
+       u8 reg = TC35892_GPIODATA0 + (offset / 8) * 2;
+       unsigned pos = offset % 8;
+       u8 data[] = {!!val << pos, 1 << pos};
+
+       tc35892_block_write(tc35892, reg, ARRAY_SIZE(data), data);
+}
+
+static int tc35892_gpio_direction_output(struct gpio_chip *chip,
+                                        unsigned offset, int val)
+{
+       struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
+       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
+       u8 reg = TC35892_GPIODIR0 + offset / 8;
+       unsigned pos = offset % 8;
+
+       tc35892_gpio_set(chip, offset, val);
+
+       return tc35892_set_bits(tc35892, reg, 1 << pos, 1 << pos);
+}
+
+static int tc35892_gpio_direction_input(struct gpio_chip *chip,
+                                       unsigned offset)
+{
+       struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
+       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
+       u8 reg = TC35892_GPIODIR0 + offset / 8;
+       unsigned pos = offset % 8;
+
+       return tc35892_set_bits(tc35892, reg, 1 << pos, 0);
+}
+
+static int tc35892_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+       struct tc35892_gpio *tc35892_gpio = to_tc35892_gpio(chip);
+
+       return tc35892_gpio->irq_base + offset;
+}
+
+static struct gpio_chip template_chip = {
+       .label                  = "tc35892",
+       .owner                  = THIS_MODULE,
+       .direction_input        = tc35892_gpio_direction_input,
+       .get                    = tc35892_gpio_get,
+       .direction_output       = tc35892_gpio_direction_output,
+       .set                    = tc35892_gpio_set,
+       .to_irq                 = tc35892_gpio_to_irq,
+       .can_sleep              = 1,
+};
+
+static int tc35892_gpio_irq_set_type(unsigned int irq, unsigned int type)
+{
+       struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
+       int offset = irq - tc35892_gpio->irq_base;
+       int regoffset = offset / 8;
+       int mask = 1 << (offset % 8);
+
+       if (type == IRQ_TYPE_EDGE_BOTH) {
+               tc35892_gpio->regs[REG_IBE][regoffset] |= mask;
+               return 0;
+       }
+
+       tc35892_gpio->regs[REG_IBE][regoffset] &= ~mask;
+
+       if (type == IRQ_TYPE_LEVEL_LOW || type == IRQ_TYPE_LEVEL_HIGH)
+               tc35892_gpio->regs[REG_IS][regoffset] |= mask;
+       else
+               tc35892_gpio->regs[REG_IS][regoffset] &= ~mask;
+
+       if (type == IRQ_TYPE_EDGE_RISING || type == IRQ_TYPE_LEVEL_HIGH)
+               tc35892_gpio->regs[REG_IEV][regoffset] |= mask;
+       else
+               tc35892_gpio->regs[REG_IEV][regoffset] &= ~mask;
+
+       return 0;
+}
+
+static void tc35892_gpio_irq_lock(unsigned int irq)
+{
+       struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
+
+       mutex_lock(&tc35892_gpio->irq_lock);
+}
+
+static void tc35892_gpio_irq_sync_unlock(unsigned int irq)
+{
+       struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
+       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
+       static const u8 regmap[] = {
+               [REG_IBE]       = TC35892_GPIOIBE0,
+               [REG_IEV]       = TC35892_GPIOIEV0,
+               [REG_IS]        = TC35892_GPIOIS0,
+               [REG_IE]        = TC35892_GPIOIE0,
+       };
+       int i, j;
+
+       for (i = 0; i < CACHE_NR_REGS; i++) {
+               for (j = 0; j < CACHE_NR_BANKS; j++) {
+                       u8 old = tc35892_gpio->oldregs[i][j];
+                       u8 new = tc35892_gpio->regs[i][j];
+
+                       if (new == old)
+                               continue;
+
+                       tc35892_gpio->oldregs[i][j] = new;
+                       tc35892_reg_write(tc35892, regmap[i] + j * 8, new);
+               }
+       }
+
+       mutex_unlock(&tc35892_gpio->irq_lock);
+}
+
+static void tc35892_gpio_irq_mask(unsigned int irq)
+{
+       struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
+       int offset = irq - tc35892_gpio->irq_base;
+       int regoffset = offset / 8;
+       int mask = 1 << (offset % 8);
+
+       tc35892_gpio->regs[REG_IE][regoffset] &= ~mask;
+}
+
+static void tc35892_gpio_irq_unmask(unsigned int irq)
+{
+       struct tc35892_gpio *tc35892_gpio = get_irq_chip_data(irq);
+       int offset = irq - tc35892_gpio->irq_base;
+       int regoffset = offset / 8;
+       int mask = 1 << (offset % 8);
+
+       tc35892_gpio->regs[REG_IE][regoffset] |= mask;
+}
+
+static struct irq_chip tc35892_gpio_irq_chip = {
+       .name                   = "tc35892-gpio",
+       .bus_lock               = tc35892_gpio_irq_lock,
+       .bus_sync_unlock        = tc35892_gpio_irq_sync_unlock,
+       .mask                   = tc35892_gpio_irq_mask,
+       .unmask                 = tc35892_gpio_irq_unmask,
+       .set_type               = tc35892_gpio_irq_set_type,
+};
+
+static irqreturn_t tc35892_gpio_irq(int irq, void *dev)
+{
+       struct tc35892_gpio *tc35892_gpio = dev;
+       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
+       u8 status[CACHE_NR_BANKS];
+       int ret;
+       int i;
+
+       ret = tc35892_block_read(tc35892, TC35892_GPIOMIS0,
+                                ARRAY_SIZE(status), status);
+       if (ret < 0)
+               return IRQ_NONE;
+
+       for (i = 0; i < ARRAY_SIZE(status); i++) {
+               unsigned int stat = status[i];
+               if (!stat)
+                       continue;
+
+               while (stat) {
+                       int bit = __ffs(stat);
+                       int line = i * 8 + bit;
+
+                       handle_nested_irq(tc35892_gpio->irq_base + line);
+                       stat &= ~(1 << bit);
+               }
+
+               tc35892_reg_write(tc35892, TC35892_GPIOIC0 + i, status[i]);
+       }
+
+       return IRQ_HANDLED;
+}
+
+static int tc35892_gpio_irq_init(struct tc35892_gpio *tc35892_gpio)
+{
+       int base = tc35892_gpio->irq_base;
+       int irq;
+
+       for (irq = base; irq < base + tc35892_gpio->chip.ngpio; irq++) {
+               set_irq_chip_data(irq, tc35892_gpio);
+               set_irq_chip_and_handler(irq, &tc35892_gpio_irq_chip,
+                                        handle_simple_irq);
+               set_irq_nested_thread(irq, 1);
+#ifdef CONFIG_ARM
+               set_irq_flags(irq, IRQF_VALID);
+#else
+               set_irq_noprobe(irq);
+#endif
+       }
+
+       return 0;
+}
+
+static void tc35892_gpio_irq_remove(struct tc35892_gpio *tc35892_gpio)
+{
+       int base = tc35892_gpio->irq_base;
+       int irq;
+
+       for (irq = base; irq < base + tc35892_gpio->chip.ngpio; irq++) {
+#ifdef CONFIG_ARM
+               set_irq_flags(irq, 0);
+#endif
+               set_irq_chip_and_handler(irq, NULL, NULL);
+               set_irq_chip_data(irq, NULL);
+       }
+}
+
+static int __devinit tc35892_gpio_probe(struct platform_device *pdev)
+{
+       struct tc35892 *tc35892 = dev_get_drvdata(pdev->dev.parent);
+       struct tc35892_gpio_platform_data *pdata;
+       struct tc35892_gpio *tc35892_gpio;
+       int ret;
+       int irq;
+
+       pdata = tc35892->pdata->gpio;
+       if (!pdata)
+               return -ENODEV;
+
+       irq = platform_get_irq(pdev, 0);
+       if (irq < 0)
+               return irq;
+
+       tc35892_gpio = kzalloc(sizeof(struct tc35892_gpio), GFP_KERNEL);
+       if (!tc35892_gpio)
+               return -ENOMEM;
+
+       mutex_init(&tc35892_gpio->irq_lock);
+
+       tc35892_gpio->dev = &pdev->dev;
+       tc35892_gpio->tc35892 = tc35892;
+
+       tc35892_gpio->chip = template_chip;
+       tc35892_gpio->chip.ngpio = tc35892->num_gpio;
+       tc35892_gpio->chip.dev = &pdev->dev;
+       tc35892_gpio->chip.base = pdata->gpio_base;
+
+       tc35892_gpio->irq_base = tc35892->irq_base + TC35892_INT_GPIO(0);
+
+       /* Bring the GPIO module out of reset */
+       ret = tc35892_set_bits(tc35892, TC35892_RSTCTRL,
+                              TC35892_RSTCTRL_GPIRST, 0);
+       if (ret < 0)
+               goto out_free;
+
+       ret = tc35892_gpio_irq_init(tc35892_gpio);
+       if (ret)
+               goto out_free;
+
+       ret = request_threaded_irq(irq, NULL, tc35892_gpio_irq, IRQF_ONESHOT,
+                                  "tc35892-gpio", tc35892_gpio);
+       if (ret) {
+               dev_err(&pdev->dev, "unable to get irq: %d\n", ret);
+               goto out_removeirq;
+       }
+
+       ret = gpiochip_add(&tc35892_gpio->chip);
+       if (ret) {
+               dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);
+               goto out_freeirq;
+       }
+
+       if (pdata->setup)
+               pdata->setup(tc35892, tc35892_gpio->chip.base);
+
+       platform_set_drvdata(pdev, tc35892_gpio);
+
+       return 0;
+
+out_freeirq:
+       free_irq(irq, tc35892_gpio);
+out_removeirq:
+       tc35892_gpio_irq_remove(tc35892_gpio);
+out_free:
+       kfree(tc35892_gpio);
+       return ret;
+}
+
+static int __devexit tc35892_gpio_remove(struct platform_device *pdev)
+{
+       struct tc35892_gpio *tc35892_gpio = platform_get_drvdata(pdev);
+       struct tc35892 *tc35892 = tc35892_gpio->tc35892;
+       struct tc35892_gpio_platform_data *pdata = tc35892->pdata->gpio;
+       int irq = platform_get_irq(pdev, 0);
+       int ret;
+
+       if (pdata->remove)
+               pdata->remove(tc35892, tc35892_gpio->chip.base);
+
+       ret = gpiochip_remove(&tc35892_gpio->chip);
+       if (ret < 0) {
+               dev_err(tc35892_gpio->dev,
+                       "unable to remove gpiochip: %d\n", ret);
+               return ret;
+       }
+
+       free_irq(irq, tc35892_gpio);
+       tc35892_gpio_irq_remove(tc35892_gpio);
+
+       platform_set_drvdata(pdev, NULL);
+       kfree(tc35892_gpio);
+
+       return 0;
+}
+
+static struct platform_driver tc35892_gpio_driver = {
+       .driver.name    = "tc35892-gpio",
+       .driver.owner   = THIS_MODULE,
+       .probe          = tc35892_gpio_probe,
+       .remove         = __devexit_p(tc35892_gpio_remove),
+};
+
+static int __init tc35892_gpio_init(void)
+{
+       return platform_driver_register(&tc35892_gpio_driver);
+}
+subsys_initcall(tc35892_gpio_init);
+
+static void __exit tc35892_gpio_exit(void)
+{
+       platform_driver_unregister(&tc35892_gpio_driver);
+}
+module_exit(tc35892_gpio_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("TC35892 GPIO driver");
+MODULE_AUTHOR("Hanumath Prasad, Rabin Vincent");
index 3a1493b8b5e565c1f5f263494efc1bc6a1405034..e8e704f52746d319b02c8d755cfa58d6c69a0308 100644 (file)
@@ -218,12 +218,12 @@ config MFD_STMPE
                Keypad: stmpe-keypad
                Touchscreen: stmpe-ts
 
-config MFD_TC35892
-       bool "Support Toshiba TC35892"
+config MFD_TC3589X
+       bool "Support Toshiba TC35892 and variants"
        depends on I2C=y && GENERIC_HARDIRQS
        select MFD_CORE
        help
-         Support for the Toshiba TC35892 I/O Expander.
+         Support for the Toshiba TC35892 and variants I/O Expander.
 
          This driver provides common support for accessing the device,
          additional drivers must be enabled in order to use the
index f54b3659abbb70bba716693396467bba5b4b035e..e590d1e44cf04110bcab9d0ed82882fe90a9a971 100644 (file)
@@ -16,7 +16,7 @@ obj-$(CONFIG_MFD_DAVINCI_VOICECODEC)  += davinci_voicecodec.o
 obj-$(CONFIG_MFD_DM355EVM_MSP) += dm355evm_msp.o
 
 obj-$(CONFIG_MFD_STMPE)                += stmpe.o
-obj-$(CONFIG_MFD_TC35892)      += tc35892.o
+obj-$(CONFIG_MFD_TC3589X)      += tc3589x.o
 obj-$(CONFIG_MFD_T7L66XB)      += t7l66xb.o tmio_core.o
 obj-$(CONFIG_MFD_TC6387XB)     += tc6387xb.o tmio_core.o
 obj-$(CONFIG_MFD_TC6393XB)     += tc6393xb.o tmio_core.o
diff --git a/drivers/mfd/tc35892.c b/drivers/mfd/tc35892.c
deleted file mode 100644 (file)
index f230235..0000000
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License, version 2
- * Author: Hanumath Prasad <hanumath.prasad@stericsson.com> for ST-Ericsson
- * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
- */
-
-#include <linux/module.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/slab.h>
-#include <linux/i2c.h>
-#include <linux/mfd/core.h>
-#include <linux/mfd/tc3589x.h>
-
-/**
- * tc35892_reg_read() - read a single TC35892 register
- * @tc35892:   Device to read from
- * @reg:       Register to read
- */
-int tc35892_reg_read(struct tc35892 *tc35892, u8 reg)
-{
-       int ret;
-
-       ret = i2c_smbus_read_byte_data(tc35892->i2c, reg);
-       if (ret < 0)
-               dev_err(tc35892->dev, "failed to read reg %#x: %d\n",
-                       reg, ret);
-
-       return ret;
-}
-EXPORT_SYMBOL_GPL(tc35892_reg_read);
-
-/**
- * tc35892_reg_read() - write a single TC35892 register
- * @tc35892:   Device to write to
- * @reg:       Register to read
- * @data:      Value to write
- */
-int tc35892_reg_write(struct tc35892 *tc35892, u8 reg, u8 data)
-{
-       int ret;
-
-       ret = i2c_smbus_write_byte_data(tc35892->i2c, reg, data);
-       if (ret < 0)
-               dev_err(tc35892->dev, "failed to write reg %#x: %d\n",
-                       reg, ret);
-
-       return ret;
-}
-EXPORT_SYMBOL_GPL(tc35892_reg_write);
-
-/**
- * tc35892_block_read() - read multiple TC35892 registers
- * @tc35892:   Device to read from
- * @reg:       First register
- * @length:    Number of registers
- * @values:    Buffer to write to
- */
-int tc35892_block_read(struct tc35892 *tc35892, u8 reg, u8 length, u8 *values)
-{
-       int ret;
-
-       ret = i2c_smbus_read_i2c_block_data(tc35892->i2c, reg, length, values);
-       if (ret < 0)
-               dev_err(tc35892->dev, "failed to read regs %#x: %d\n",
-                       reg, ret);
-
-       return ret;
-}
-EXPORT_SYMBOL_GPL(tc35892_block_read);
-
-/**
- * tc35892_block_write() - write multiple TC35892 registers
- * @tc35892:   Device to write to
- * @reg:       First register
- * @length:    Number of registers
- * @values:    Values to write
- */
-int tc35892_block_write(struct tc35892 *tc35892, u8 reg, u8 length,
-                       const u8 *values)
-{
-       int ret;
-
-       ret = i2c_smbus_write_i2c_block_data(tc35892->i2c, reg, length,
-                                            values);
-       if (ret < 0)
-               dev_err(tc35892->dev, "failed to write regs %#x: %d\n",
-                       reg, ret);
-
-       return ret;
-}
-EXPORT_SYMBOL_GPL(tc35892_block_write);
-
-/**
- * tc35892_set_bits() - set the value of a bitfield in a TC35892 register
- * @tc35892:   Device to write to
- * @reg:       Register to write
- * @mask:      Mask of bits to set
- * @values:    Value to set
- */
-int tc35892_set_bits(struct tc35892 *tc35892, u8 reg, u8 mask, u8 val)
-{
-       int ret;
-
-       mutex_lock(&tc35892->lock);
-
-       ret = tc35892_reg_read(tc35892, reg);
-       if (ret < 0)
-               goto out;
-
-       ret &= ~mask;
-       ret |= val;
-
-       ret = tc35892_reg_write(tc35892, reg, ret);
-
-out:
-       mutex_unlock(&tc35892->lock);
-       return ret;
-}
-EXPORT_SYMBOL_GPL(tc35892_set_bits);
-
-static struct resource gpio_resources[] = {
-       {
-               .start  = TC35892_INT_GPIIRQ,
-               .end    = TC35892_INT_GPIIRQ,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct mfd_cell tc35892_devs[] = {
-       {
-               .name           = "tc35892-gpio",
-               .num_resources  = ARRAY_SIZE(gpio_resources),
-               .resources      = &gpio_resources[0],
-       },
-};
-
-static irqreturn_t tc35892_irq(int irq, void *data)
-{
-       struct tc35892 *tc35892 = data;
-       int status;
-
-       status = tc35892_reg_read(tc35892, TC35892_IRQST);
-       if (status < 0)
-               return IRQ_NONE;
-
-       while (status) {
-               int bit = __ffs(status);
-
-               handle_nested_irq(tc35892->irq_base + bit);
-               status &= ~(1 << bit);
-       }
-
-       /*
-        * A dummy read or write (to any register) appears to be necessary to
-        * have the last interrupt clear (for example, GPIO IC write) take
-        * effect.
-        */
-       tc35892_reg_read(tc35892, TC35892_IRQST);
-
-       return IRQ_HANDLED;
-}
-
-static void tc35892_irq_dummy(unsigned int irq)
-{
-       /* No mask/unmask at this level */
-}
-
-static struct irq_chip tc35892_irq_chip = {
-       .name   = "tc35892",
-       .mask   = tc35892_irq_dummy,
-       .unmask = tc35892_irq_dummy,
-};
-
-static int tc35892_irq_init(struct tc35892 *tc35892)
-{
-       int base = tc35892->irq_base;
-       int irq;
-
-       for (irq = base; irq < base + TC35892_NR_INTERNAL_IRQS; irq++) {
-               set_irq_chip_data(irq, tc35892);
-               set_irq_chip_and_handler(irq, &tc35892_irq_chip,
-                                        handle_edge_irq);
-               set_irq_nested_thread(irq, 1);
-#ifdef CONFIG_ARM
-               set_irq_flags(irq, IRQF_VALID);
-#else
-               set_irq_noprobe(irq);
-#endif
-       }
-
-       return 0;
-}
-
-static void tc35892_irq_remove(struct tc35892 *tc35892)
-{
-       int base = tc35892->irq_base;
-       int irq;
-
-       for (irq = base; irq < base + TC35892_NR_INTERNAL_IRQS; irq++) {
-#ifdef CONFIG_ARM
-               set_irq_flags(irq, 0);
-#endif
-               set_irq_chip_and_handler(irq, NULL, NULL);
-               set_irq_chip_data(irq, NULL);
-       }
-}
-
-static int tc35892_chip_init(struct tc35892 *tc35892)
-{
-       int manf, ver, ret;
-
-       manf = tc35892_reg_read(tc35892, TC35892_MANFCODE);
-       if (manf < 0)
-               return manf;
-
-       ver = tc35892_reg_read(tc35892, TC35892_VERSION);
-       if (ver < 0)
-               return ver;
-
-       if (manf != TC35892_MANFCODE_MAGIC) {
-               dev_err(tc35892->dev, "unknown manufacturer: %#x\n", manf);
-               return -EINVAL;
-       }
-
-       dev_info(tc35892->dev, "manufacturer: %#x, version: %#x\n", manf, ver);
-
-       /* Put everything except the IRQ module into reset */
-       ret = tc35892_reg_write(tc35892, TC35892_RSTCTRL,
-                               TC35892_RSTCTRL_TIMRST
-                               | TC35892_RSTCTRL_ROTRST
-                               | TC35892_RSTCTRL_KBDRST
-                               | TC35892_RSTCTRL_GPIRST);
-       if (ret < 0)
-               return ret;
-
-       /* Clear the reset interrupt. */
-       return tc35892_reg_write(tc35892, TC35892_RSTINTCLR, 0x1);
-}
-
-static int __devinit tc35892_probe(struct i2c_client *i2c,
-                                  const struct i2c_device_id *id)
-{
-       struct tc35892_platform_data *pdata = i2c->dev.platform_data;
-       struct tc35892 *tc35892;
-       int ret;
-
-       if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA
-                                    | I2C_FUNC_SMBUS_I2C_BLOCK))
-               return -EIO;
-
-       tc35892 = kzalloc(sizeof(struct tc35892), GFP_KERNEL);
-       if (!tc35892)
-               return -ENOMEM;
-
-       mutex_init(&tc35892->lock);
-
-       tc35892->dev = &i2c->dev;
-       tc35892->i2c = i2c;
-       tc35892->pdata = pdata;
-       tc35892->irq_base = pdata->irq_base;
-       tc35892->num_gpio = id->driver_data;
-
-       i2c_set_clientdata(i2c, tc35892);
-
-       ret = tc35892_chip_init(tc35892);
-       if (ret)
-               goto out_free;
-
-       ret = tc35892_irq_init(tc35892);
-       if (ret)
-               goto out_free;
-
-       ret = request_threaded_irq(tc35892->i2c->irq, NULL, tc35892_irq,
-                                  IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
-                                  "tc35892", tc35892);
-       if (ret) {
-               dev_err(tc35892->dev, "failed to request IRQ: %d\n", ret);
-               goto out_removeirq;
-       }
-
-       ret = mfd_add_devices(tc35892->dev, -1, tc35892_devs,
-                             ARRAY_SIZE(tc35892_devs), NULL,
-                             tc35892->irq_base);
-       if (ret) {
-               dev_err(tc35892->dev, "failed to add children\n");
-               goto out_freeirq;
-       }
-
-       return 0;
-
-out_freeirq:
-       free_irq(tc35892->i2c->irq, tc35892);
-out_removeirq:
-       tc35892_irq_remove(tc35892);
-out_free:
-       kfree(tc35892);
-       return ret;
-}
-
-static int __devexit tc35892_remove(struct i2c_client *client)
-{
-       struct tc35892 *tc35892 = i2c_get_clientdata(client);
-
-       mfd_remove_devices(tc35892->dev);
-
-       free_irq(tc35892->i2c->irq, tc35892);
-       tc35892_irq_remove(tc35892);
-
-       kfree(tc35892);
-
-       return 0;
-}
-
-static const struct i2c_device_id tc35892_id[] = {
-       { "tc35892", 24 },
-       { }
-};
-MODULE_DEVICE_TABLE(i2c, tc35892_id);
-
-static struct i2c_driver tc35892_driver = {
-       .driver.name    = "tc35892",
-       .driver.owner   = THIS_MODULE,
-       .probe          = tc35892_probe,
-       .remove         = __devexit_p(tc35892_remove),
-       .id_table       = tc35892_id,
-};
-
-static int __init tc35892_init(void)
-{
-       return i2c_add_driver(&tc35892_driver);
-}
-subsys_initcall(tc35892_init);
-
-static void __exit tc35892_exit(void)
-{
-       i2c_del_driver(&tc35892_driver);
-}
-module_exit(tc35892_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("TC35892 MFD core driver");
-MODULE_AUTHOR("Hanumath Prasad, Rabin Vincent");
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
new file mode 100644 (file)
index 0000000..f230235
--- /dev/null
@@ -0,0 +1,345 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ *
+ * License Terms: GNU General Public License, version 2
+ * Author: Hanumath Prasad <hanumath.prasad@stericsson.com> for ST-Ericsson
+ * Author: Rabin Vincent <rabin.vincent@stericsson.com> for ST-Ericsson
+ */
+
+#include <linux/module.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/slab.h>
+#include <linux/i2c.h>
+#include <linux/mfd/core.h>
+#include <linux/mfd/tc3589x.h>
+
+/**
+ * tc35892_reg_read() - read a single TC35892 register
+ * @tc35892:   Device to read from
+ * @reg:       Register to read
+ */
+int tc35892_reg_read(struct tc35892 *tc35892, u8 reg)
+{
+       int ret;
+
+       ret = i2c_smbus_read_byte_data(tc35892->i2c, reg);
+       if (ret < 0)
+               dev_err(tc35892->dev, "failed to read reg %#x: %d\n",
+                       reg, ret);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(tc35892_reg_read);
+
+/**
+ * tc35892_reg_read() - write a single TC35892 register
+ * @tc35892:   Device to write to
+ * @reg:       Register to read
+ * @data:      Value to write
+ */
+int tc35892_reg_write(struct tc35892 *tc35892, u8 reg, u8 data)
+{
+       int ret;
+
+       ret = i2c_smbus_write_byte_data(tc35892->i2c, reg, data);
+       if (ret < 0)
+               dev_err(tc35892->dev, "failed to write reg %#x: %d\n",
+                       reg, ret);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(tc35892_reg_write);
+
+/**
+ * tc35892_block_read() - read multiple TC35892 registers
+ * @tc35892:   Device to read from
+ * @reg:       First register
+ * @length:    Number of registers
+ * @values:    Buffer to write to
+ */
+int tc35892_block_read(struct tc35892 *tc35892, u8 reg, u8 length, u8 *values)
+{
+       int ret;
+
+       ret = i2c_smbus_read_i2c_block_data(tc35892->i2c, reg, length, values);
+       if (ret < 0)
+               dev_err(tc35892->dev, "failed to read regs %#x: %d\n",
+                       reg, ret);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(tc35892_block_read);
+
+/**
+ * tc35892_block_write() - write multiple TC35892 registers
+ * @tc35892:   Device to write to
+ * @reg:       First register
+ * @length:    Number of registers
+ * @values:    Values to write
+ */
+int tc35892_block_write(struct tc35892 *tc35892, u8 reg, u8 length,
+                       const u8 *values)
+{
+       int ret;
+
+       ret = i2c_smbus_write_i2c_block_data(tc35892->i2c, reg, length,
+                                            values);
+       if (ret < 0)
+               dev_err(tc35892->dev, "failed to write regs %#x: %d\n",
+                       reg, ret);
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(tc35892_block_write);
+
+/**
+ * tc35892_set_bits() - set the value of a bitfield in a TC35892 register
+ * @tc35892:   Device to write to
+ * @reg:       Register to write
+ * @mask:      Mask of bits to set
+ * @values:    Value to set
+ */
+int tc35892_set_bits(struct tc35892 *tc35892, u8 reg, u8 mask, u8 val)
+{
+       int ret;
+
+       mutex_lock(&tc35892->lock);
+
+       ret = tc35892_reg_read(tc35892, reg);
+       if (ret < 0)
+               goto out;
+
+       ret &= ~mask;
+       ret |= val;
+
+       ret = tc35892_reg_write(tc35892, reg, ret);
+
+out:
+       mutex_unlock(&tc35892->lock);
+       return ret;
+}
+EXPORT_SYMBOL_GPL(tc35892_set_bits);
+
+static struct resource gpio_resources[] = {
+       {
+               .start  = TC35892_INT_GPIIRQ,
+               .end    = TC35892_INT_GPIIRQ,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct mfd_cell tc35892_devs[] = {
+       {
+               .name           = "tc35892-gpio",
+               .num_resources  = ARRAY_SIZE(gpio_resources),
+               .resources      = &gpio_resources[0],
+       },
+};
+
+static irqreturn_t tc35892_irq(int irq, void *data)
+{
+       struct tc35892 *tc35892 = data;
+       int status;
+
+       status = tc35892_reg_read(tc35892, TC35892_IRQST);
+       if (status < 0)
+               return IRQ_NONE;
+
+       while (status) {
+               int bit = __ffs(status);
+
+               handle_nested_irq(tc35892->irq_base + bit);
+               status &= ~(1 << bit);
+       }
+
+       /*
+        * A dummy read or write (to any register) appears to be necessary to
+        * have the last interrupt clear (for example, GPIO IC write) take
+        * effect.
+        */
+       tc35892_reg_read(tc35892, TC35892_IRQST);
+
+       return IRQ_HANDLED;
+}
+
+static void tc35892_irq_dummy(unsigned int irq)
+{
+       /* No mask/unmask at this level */
+}
+
+static struct irq_chip tc35892_irq_chip = {
+       .name   = "tc35892",
+       .mask   = tc35892_irq_dummy,
+       .unmask = tc35892_irq_dummy,
+};
+
+static int tc35892_irq_init(struct tc35892 *tc35892)
+{
+       int base = tc35892->irq_base;
+       int irq;
+
+       for (irq = base; irq < base + TC35892_NR_INTERNAL_IRQS; irq++) {
+               set_irq_chip_data(irq, tc35892);
+               set_irq_chip_and_handler(irq, &tc35892_irq_chip,
+                                        handle_edge_irq);
+               set_irq_nested_thread(irq, 1);
+#ifdef CONFIG_ARM
+               set_irq_flags(irq, IRQF_VALID);
+#else
+               set_irq_noprobe(irq);
+#endif
+       }
+
+       return 0;
+}
+
+static void tc35892_irq_remove(struct tc35892 *tc35892)
+{
+       int base = tc35892->irq_base;
+       int irq;
+
+       for (irq = base; irq < base + TC35892_NR_INTERNAL_IRQS; irq++) {
+#ifdef CONFIG_ARM
+               set_irq_flags(irq, 0);
+#endif
+               set_irq_chip_and_handler(irq, NULL, NULL);
+               set_irq_chip_data(irq, NULL);
+       }
+}
+
+static int tc35892_chip_init(struct tc35892 *tc35892)
+{
+       int manf, ver, ret;
+
+       manf = tc35892_reg_read(tc35892, TC35892_MANFCODE);
+       if (manf < 0)
+               return manf;
+
+       ver = tc35892_reg_read(tc35892, TC35892_VERSION);
+       if (ver < 0)
+               return ver;
+
+       if (manf != TC35892_MANFCODE_MAGIC) {
+               dev_err(tc35892->dev, "unknown manufacturer: %#x\n", manf);
+               return -EINVAL;
+       }
+
+       dev_info(tc35892->dev, "manufacturer: %#x, version: %#x\n", manf, ver);
+
+       /* Put everything except the IRQ module into reset */
+       ret = tc35892_reg_write(tc35892, TC35892_RSTCTRL,
+                               TC35892_RSTCTRL_TIMRST
+                               | TC35892_RSTCTRL_ROTRST
+                               | TC35892_RSTCTRL_KBDRST
+                               | TC35892_RSTCTRL_GPIRST);
+       if (ret < 0)
+               return ret;
+
+       /* Clear the reset interrupt. */
+       return tc35892_reg_write(tc35892, TC35892_RSTINTCLR, 0x1);
+}
+
+static int __devinit tc35892_probe(struct i2c_client *i2c,
+                                  const struct i2c_device_id *id)
+{
+       struct tc35892_platform_data *pdata = i2c->dev.platform_data;
+       struct tc35892 *tc35892;
+       int ret;
+
+       if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA
+                                    | I2C_FUNC_SMBUS_I2C_BLOCK))
+               return -EIO;
+
+       tc35892 = kzalloc(sizeof(struct tc35892), GFP_KERNEL);
+       if (!tc35892)
+               return -ENOMEM;
+
+       mutex_init(&tc35892->lock);
+
+       tc35892->dev = &i2c->dev;
+       tc35892->i2c = i2c;
+       tc35892->pdata = pdata;
+       tc35892->irq_base = pdata->irq_base;
+       tc35892->num_gpio = id->driver_data;
+
+       i2c_set_clientdata(i2c, tc35892);
+
+       ret = tc35892_chip_init(tc35892);
+       if (ret)
+               goto out_free;
+
+       ret = tc35892_irq_init(tc35892);
+       if (ret)
+               goto out_free;
+
+       ret = request_threaded_irq(tc35892->i2c->irq, NULL, tc35892_irq,
+                                  IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                  "tc35892", tc35892);
+       if (ret) {
+               dev_err(tc35892->dev, "failed to request IRQ: %d\n", ret);
+               goto out_removeirq;
+       }
+
+       ret = mfd_add_devices(tc35892->dev, -1, tc35892_devs,
+                             ARRAY_SIZE(tc35892_devs), NULL,
+                             tc35892->irq_base);
+       if (ret) {
+               dev_err(tc35892->dev, "failed to add children\n");
+               goto out_freeirq;
+       }
+
+       return 0;
+
+out_freeirq:
+       free_irq(tc35892->i2c->irq, tc35892);
+out_removeirq:
+       tc35892_irq_remove(tc35892);
+out_free:
+       kfree(tc35892);
+       return ret;
+}
+
+static int __devexit tc35892_remove(struct i2c_client *client)
+{
+       struct tc35892 *tc35892 = i2c_get_clientdata(client);
+
+       mfd_remove_devices(tc35892->dev);
+
+       free_irq(tc35892->i2c->irq, tc35892);
+       tc35892_irq_remove(tc35892);
+
+       kfree(tc35892);
+
+       return 0;
+}
+
+static const struct i2c_device_id tc35892_id[] = {
+       { "tc35892", 24 },
+       { }
+};
+MODULE_DEVICE_TABLE(i2c, tc35892_id);
+
+static struct i2c_driver tc35892_driver = {
+       .driver.name    = "tc35892",
+       .driver.owner   = THIS_MODULE,
+       .probe          = tc35892_probe,
+       .remove         = __devexit_p(tc35892_remove),
+       .id_table       = tc35892_id,
+};
+
+static int __init tc35892_init(void)
+{
+       return i2c_add_driver(&tc35892_driver);
+}
+subsys_initcall(tc35892_init);
+
+static void __exit tc35892_exit(void)
+{
+       i2c_del_driver(&tc35892_driver);
+}
+module_exit(tc35892_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("TC35892 MFD core driver");
+MODULE_AUTHOR("Hanumath Prasad, Rabin Vincent");