mfd: Convert 88pm860x to use regmap api
[linux-2.6.git] / drivers / mfd / tps6586x.c
index 4cde31e..a5ddf31 100644 (file)
@@ -15,6 +15,8 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/interrupt.h>
+#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #define TPS6586X_GPIOSET1      0x5d
 #define TPS6586X_GPIOSET2      0x5e
 
+/* interrupt control registers */
+#define TPS6586X_INT_ACK1      0xb5
+#define TPS6586X_INT_ACK2      0xb6
+#define TPS6586X_INT_ACK3      0xb7
+#define TPS6586X_INT_ACK4      0xb8
+
+/* interrupt mask registers */
+#define TPS6586X_INT_MASK1     0xb0
+#define TPS6586X_INT_MASK2     0xb1
+#define TPS6586X_INT_MASK3     0xb2
+#define TPS6586X_INT_MASK4     0xb3
+#define TPS6586X_INT_MASK5     0xb4
+
 /* device id */
 #define TPS6586X_VERSIONCRC    0xcd
-#define TPS658621A_VERSIONCRC  0x15
+
+struct tps6586x_irq_data {
+       u8      mask_reg;
+       u8      mask_mask;
+};
+
+#define TPS6586X_IRQ(_reg, _mask)                              \
+       {                                                       \
+               .mask_reg = (_reg) - TPS6586X_INT_MASK1,        \
+               .mask_mask = (_mask),                           \
+       }
+
+static const struct tps6586x_irq_data tps6586x_irqs[] = {
+       [TPS6586X_INT_PLDO_0]   = TPS6586X_IRQ(TPS6586X_INT_MASK1, 1 << 0),
+       [TPS6586X_INT_PLDO_1]   = TPS6586X_IRQ(TPS6586X_INT_MASK1, 1 << 1),
+       [TPS6586X_INT_PLDO_2]   = TPS6586X_IRQ(TPS6586X_INT_MASK1, 1 << 2),
+       [TPS6586X_INT_PLDO_3]   = TPS6586X_IRQ(TPS6586X_INT_MASK1, 1 << 3),
+       [TPS6586X_INT_PLDO_4]   = TPS6586X_IRQ(TPS6586X_INT_MASK1, 1 << 4),
+       [TPS6586X_INT_PLDO_5]   = TPS6586X_IRQ(TPS6586X_INT_MASK1, 1 << 5),
+       [TPS6586X_INT_PLDO_6]   = TPS6586X_IRQ(TPS6586X_INT_MASK1, 1 << 6),
+       [TPS6586X_INT_PLDO_7]   = TPS6586X_IRQ(TPS6586X_INT_MASK1, 1 << 7),
+       [TPS6586X_INT_COMP_DET] = TPS6586X_IRQ(TPS6586X_INT_MASK4, 1 << 0),
+       [TPS6586X_INT_ADC]      = TPS6586X_IRQ(TPS6586X_INT_MASK2, 1 << 1),
+       [TPS6586X_INT_PLDO_8]   = TPS6586X_IRQ(TPS6586X_INT_MASK2, 1 << 2),
+       [TPS6586X_INT_PLDO_9]   = TPS6586X_IRQ(TPS6586X_INT_MASK2, 1 << 3),
+       [TPS6586X_INT_PSM_0]    = TPS6586X_IRQ(TPS6586X_INT_MASK2, 1 << 4),
+       [TPS6586X_INT_PSM_1]    = TPS6586X_IRQ(TPS6586X_INT_MASK2, 1 << 5),
+       [TPS6586X_INT_PSM_2]    = TPS6586X_IRQ(TPS6586X_INT_MASK2, 1 << 6),
+       [TPS6586X_INT_PSM_3]    = TPS6586X_IRQ(TPS6586X_INT_MASK2, 1 << 7),
+       [TPS6586X_INT_RTC_ALM1] = TPS6586X_IRQ(TPS6586X_INT_MASK5, 1 << 4),
+       [TPS6586X_INT_ACUSB_OVP] = TPS6586X_IRQ(TPS6586X_INT_MASK5, 0x03),
+       [TPS6586X_INT_USB_DET]  = TPS6586X_IRQ(TPS6586X_INT_MASK5, 1 << 2),
+       [TPS6586X_INT_AC_DET]   = TPS6586X_IRQ(TPS6586X_INT_MASK5, 1 << 3),
+       [TPS6586X_INT_BAT_DET]  = TPS6586X_IRQ(TPS6586X_INT_MASK3, 1 << 0),
+       [TPS6586X_INT_CHG_STAT] = TPS6586X_IRQ(TPS6586X_INT_MASK4, 0xfc),
+       [TPS6586X_INT_CHG_TEMP] = TPS6586X_IRQ(TPS6586X_INT_MASK3, 0x06),
+       [TPS6586X_INT_PP]       = TPS6586X_IRQ(TPS6586X_INT_MASK3, 0xf0),
+       [TPS6586X_INT_RESUME]   = TPS6586X_IRQ(TPS6586X_INT_MASK5, 1 << 5),
+       [TPS6586X_INT_LOW_SYS]  = TPS6586X_IRQ(TPS6586X_INT_MASK5, 1 << 6),
+       [TPS6586X_INT_RTC_ALM2] = TPS6586X_IRQ(TPS6586X_INT_MASK4, 1 << 1),
+};
 
 struct tps6586x {
        struct mutex            lock;
@@ -39,6 +94,12 @@ struct tps6586x {
        struct i2c_client       *client;
 
        struct gpio_chip        gpio;
+       struct irq_chip         irq_chip;
+       struct mutex            irq_lock;
+       int                     irq_base;
+       u32                     irq_en;
+       u8                      mask_cache[5];
+       u8                      mask_reg[5];
 };
 
 static inline int __tps6586x_read(struct i2c_client *client,
@@ -89,12 +150,12 @@ static inline int __tps6586x_write(struct i2c_client *client,
 static inline int __tps6586x_writes(struct i2c_client *client, int reg,
                                  int len, uint8_t *val)
 {
-       int ret;
+       int ret, i;
 
-       ret = i2c_smbus_write_i2c_block_data(client, reg, len, val);
-       if (ret < 0) {
-               dev_err(&client->dev, "failed writings to 0x%02x\n", reg);
-               return ret;
+       for (i = 0; i < len; i++) {
+               ret = __tps6586x_write(client, reg + i, *(val + i));
+               if (ret < 0)
+                       return ret;
        }
 
        return 0;
@@ -136,7 +197,7 @@ int tps6586x_set_bits(struct device *dev, int reg, uint8_t bit_mask)
        if (ret)
                goto out;
 
-       if ((reg_val & bit_mask) == 0) {
+       if ((reg_val & bit_mask) != bit_mask) {
                reg_val |= bit_mask;
                ret = __tps6586x_write(to_i2c_client(dev), reg, reg_val);
        }
@@ -209,8 +270,8 @@ static void tps6586x_gpio_set(struct gpio_chip *chip, unsigned offset,
 {
        struct tps6586x *tps6586x = container_of(chip, struct tps6586x, gpio);
 
-       __tps6586x_write(tps6586x->client, TPS6586X_GPIOSET2,
-                        value << offset);
+       tps6586x_update(tps6586x->dev, TPS6586X_GPIOSET2,
+                       value << offset, 1 << offset);
 }
 
 static int tps6586x_gpio_output(struct gpio_chip *gc, unsigned offset,
@@ -227,12 +288,10 @@ static int tps6586x_gpio_output(struct gpio_chip *gc, unsigned offset,
        return tps6586x_update(tps6586x->dev, TPS6586X_GPIOSET1, val, mask);
 }
 
-static void tps6586x_gpio_init(struct tps6586x *tps6586x, int gpio_base)
+static int tps6586x_gpio_init(struct tps6586x *tps6586x, int gpio_base)
 {
-       int ret;
-
        if (!gpio_base)
-               return;
+               return 0;
 
        tps6586x->gpio.owner            = THIS_MODULE;
        tps6586x->gpio.label            = tps6586x->client->name;
@@ -246,9 +305,7 @@ static void tps6586x_gpio_init(struct tps6586x *tps6586x, int gpio_base)
        tps6586x->gpio.set              = tps6586x_gpio_set;
        tps6586x->gpio.get              = tps6586x_gpio_get;
 
-       ret = gpiochip_add(&tps6586x->gpio);
-       if (ret)
-               dev_warn(tps6586x->dev, "GPIO registration failed: %d\n", ret);
+       return gpiochip_add(&tps6586x->gpio);
 }
 
 static int __remove_subdev(struct device *dev, void *unused)
@@ -262,6 +319,129 @@ static int tps6586x_remove_subdevs(struct tps6586x *tps6586x)
        return device_for_each_child(tps6586x->dev, NULL, __remove_subdev);
 }
 
+static void tps6586x_irq_lock(struct irq_data *data)
+{
+       struct tps6586x *tps6586x = irq_data_get_irq_chip_data(data);
+
+       mutex_lock(&tps6586x->irq_lock);
+}
+
+static void tps6586x_irq_enable(struct irq_data *irq_data)
+{
+       struct tps6586x *tps6586x = irq_data_get_irq_chip_data(irq_data);
+       unsigned int __irq = irq_data->irq - tps6586x->irq_base;
+       const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq];
+
+       tps6586x->mask_reg[data->mask_reg] &= ~data->mask_mask;
+       tps6586x->irq_en |= (1 << __irq);
+}
+
+static void tps6586x_irq_disable(struct irq_data *irq_data)
+{
+       struct tps6586x *tps6586x = irq_data_get_irq_chip_data(irq_data);
+
+       unsigned int __irq = irq_data->irq - tps6586x->irq_base;
+       const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq];
+
+       tps6586x->mask_reg[data->mask_reg] |= data->mask_mask;
+       tps6586x->irq_en &= ~(1 << __irq);
+}
+
+static void tps6586x_irq_sync_unlock(struct irq_data *data)
+{
+       struct tps6586x *tps6586x = irq_data_get_irq_chip_data(data);
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(tps6586x->mask_reg); i++) {
+               if (tps6586x->mask_reg[i] != tps6586x->mask_cache[i]) {
+                       if (!WARN_ON(tps6586x_write(tps6586x->dev,
+                                                   TPS6586X_INT_MASK1 + i,
+                                                   tps6586x->mask_reg[i])))
+                               tps6586x->mask_cache[i] = tps6586x->mask_reg[i];
+               }
+       }
+
+       mutex_unlock(&tps6586x->irq_lock);
+}
+
+static irqreturn_t tps6586x_irq(int irq, void *data)
+{
+       struct tps6586x *tps6586x = data;
+       u32 acks;
+       int ret = 0;
+
+       ret = tps6586x_reads(tps6586x->dev, TPS6586X_INT_ACK1,
+                            sizeof(acks), (uint8_t *)&acks);
+
+       if (ret < 0) {
+               dev_err(tps6586x->dev, "failed to read interrupt status\n");
+               return IRQ_NONE;
+       }
+
+       acks = le32_to_cpu(acks);
+
+       while (acks) {
+               int i = __ffs(acks);
+
+               if (tps6586x->irq_en & (1 << i))
+                       handle_nested_irq(tps6586x->irq_base + i);
+
+               acks &= ~(1 << i);
+       }
+
+       return IRQ_HANDLED;
+}
+
+static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
+                                      int irq_base)
+{
+       int i, ret;
+       u8 tmp[4];
+
+       if (!irq_base) {
+               dev_warn(tps6586x->dev, "No interrupt support on IRQ base\n");
+               return -EINVAL;
+       }
+
+       mutex_init(&tps6586x->irq_lock);
+       for (i = 0; i < 5; i++) {
+               tps6586x->mask_cache[i] = 0xff;
+               tps6586x->mask_reg[i] = 0xff;
+               tps6586x_write(tps6586x->dev, TPS6586X_INT_MASK1 + i, 0xff);
+       }
+
+       tps6586x_reads(tps6586x->dev, TPS6586X_INT_ACK1, sizeof(tmp), tmp);
+
+       tps6586x->irq_base = irq_base;
+
+       tps6586x->irq_chip.name = "tps6586x";
+       tps6586x->irq_chip.irq_enable = tps6586x_irq_enable;
+       tps6586x->irq_chip.irq_disable = tps6586x_irq_disable;
+       tps6586x->irq_chip.irq_bus_lock = tps6586x_irq_lock;
+       tps6586x->irq_chip.irq_bus_sync_unlock = tps6586x_irq_sync_unlock;
+
+       for (i = 0; i < ARRAY_SIZE(tps6586x_irqs); i++) {
+               int __irq = i + tps6586x->irq_base;
+               irq_set_chip_data(__irq, tps6586x);
+               irq_set_chip_and_handler(__irq, &tps6586x->irq_chip,
+                                        handle_simple_irq);
+               irq_set_nested_thread(__irq, 1);
+#ifdef CONFIG_ARM
+               set_irq_flags(__irq, IRQF_VALID);
+#endif
+       }
+
+       ret = request_threaded_irq(irq, NULL, tps6586x_irq, IRQF_ONESHOT,
+                                  "tps6586x", tps6586x);
+
+       if (!ret) {
+               device_init_wakeup(tps6586x->dev, 1);
+               enable_irq_wake(irq);
+       }
+
+       return ret;
+}
+
 static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x,
                                          struct tps6586x_platform_data *pdata)
 {
@@ -273,13 +453,19 @@ static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x,
                subdev = &pdata->subdevs[i];
 
                pdev = platform_device_alloc(subdev->name, subdev->id);
+               if (!pdev) {
+                       ret = -ENOMEM;
+                       goto failed;
+               }
 
                pdev->dev.parent = tps6586x->dev;
                pdev->dev.platform_data = subdev->platform_data;
 
                ret = platform_device_add(pdev);
-               if (ret)
+               if (ret) {
+                       platform_device_put(pdev);
                        goto failed;
+               }
        }
        return 0;
 
@@ -306,10 +492,7 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
                return -EIO;
        }
 
-       if (ret != TPS658621A_VERSIONCRC) {
-               dev_err(&client->dev, "Unsupported chip ID: %x\n", ret);
-               return -ENODEV;
-       }
+       dev_info(&client->dev, "VERSIONCRC is %02x\n", ret);
 
        tps6586x = kzalloc(sizeof(struct tps6586x), GFP_KERNEL);
        if (tps6586x == NULL)
@@ -321,23 +504,62 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
 
        mutex_init(&tps6586x->lock);
 
+       if (client->irq) {
+               ret = tps6586x_irq_init(tps6586x, client->irq,
+                                       pdata->irq_base);
+               if (ret) {
+                       dev_err(&client->dev, "IRQ init failed: %d\n", ret);
+                       goto err_irq_init;
+               }
+       }
+
+       ret = tps6586x_gpio_init(tps6586x, pdata->gpio_base);
+       if (ret) {
+               dev_err(&client->dev, "GPIO registration failed: %d\n", ret);
+               goto err_gpio_init;
+       }
+
        ret = tps6586x_add_subdevs(tps6586x, pdata);
        if (ret) {
                dev_err(&client->dev, "add devices failed: %d\n", ret);
                goto err_add_devs;
        }
 
-       tps6586x_gpio_init(tps6586x, pdata->gpio_base);
-
        return 0;
 
 err_add_devs:
+       if (pdata->gpio_base) {
+               ret = gpiochip_remove(&tps6586x->gpio);
+               if (ret)
+                       dev_err(&client->dev, "Can't remove gpio chip: %d\n",
+                               ret);
+       }
+err_gpio_init:
+       if (client->irq)
+               free_irq(client->irq, tps6586x);
+err_irq_init:
        kfree(tps6586x);
        return ret;
 }
 
 static int __devexit tps6586x_i2c_remove(struct i2c_client *client)
 {
+       struct tps6586x *tps6586x = i2c_get_clientdata(client);
+       struct tps6586x_platform_data *pdata = client->dev.platform_data;
+       int ret;
+
+       if (client->irq)
+               free_irq(client->irq, tps6586x);
+
+       if (pdata->gpio_base) {
+               ret = gpiochip_remove(&tps6586x->gpio);
+               if (ret)
+                       dev_err(&client->dev, "Can't remove gpio chip: %d\n",
+                               ret);
+       }
+
+       tps6586x_remove_subdevs(tps6586x);
+       kfree(tps6586x);
        return 0;
 }
 
@@ -372,4 +594,3 @@ module_exit(tps6586x_exit);
 MODULE_DESCRIPTION("TPS6586X core driver");
 MODULE_AUTHOR("Mike Rapoport <mike@compulab.co.il>");
 MODULE_LICENSE("GPL");
-