Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / drivers / mfd / tc3589x.c

diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
index b56ba6b43294b77e536b12247c0e8b1d18085701..8f4c853ca116f1b34d73f811545a3c9f49ac4037 100644 (file)
--- a/drivers/mfd/tc3589x.c
+++ b/drivers/mfd/tc3589x.c
@@ -9,8 +9,10 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/irqdomain.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include <linux/of.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tc3589x.h>
 
@@ -145,6 +147,7 @@ static struct mfd_cell tc3589x_dev_gpio[] = {
                .name           = "tc3589x-gpio",
                .num_resources  = ARRAY_SIZE(gpio_resources),
                .resources      = &gpio_resources[0],
+               .of_compatible  = "tc3589x-gpio",
        },
 };
 
@@ -153,6 +156,7 @@ static struct mfd_cell tc3589x_dev_keypad[] = {
                .name           = "tc3589x-keypad",
                .num_resources  = ARRAY_SIZE(keypad_resources),
                .resources      = &keypad_resources[0],
+               .of_compatible  = "tc3589x-keypad",
        },
 };
 
@@ -168,8 +172,9 @@ again:
 
        while (status) {
                int bit = __ffs(status);
+               int virq = irq_create_mapping(tc3589x->domain, bit);
 
-               handle_nested_irq(tc3589x->irq_base + bit);
+               handle_nested_irq(virq);
                status &= ~(1 << bit);
        }
 
@@ -186,38 +191,60 @@ again:
        return IRQ_HANDLED;
 }
 
-static int tc3589x_irq_init(struct tc3589x *tc3589x)
+static int tc3589x_irq_map(struct irq_domain *d, unsigned int virq,
+                               irq_hw_number_t hwirq)
 {
-       int base = tc3589x->irq_base;
-       int irq;
+       struct tc3589x *tc3589x = d->host_data;
 
-       for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) {
-               irq_set_chip_data(irq, tc3589x);
-               irq_set_chip_and_handler(irq, &dummy_irq_chip,
-                                        handle_edge_irq);
-               irq_set_nested_thread(irq, 1);
+       irq_set_chip_data(virq, tc3589x);
+       irq_set_chip_and_handler(virq, &dummy_irq_chip,
+                               handle_edge_irq);
+       irq_set_nested_thread(virq, 1);
 #ifdef CONFIG_ARM
-               set_irq_flags(irq, IRQF_VALID);
+       set_irq_flags(virq, IRQF_VALID);
 #else
-               irq_set_noprobe(irq);
+       irq_set_noprobe(virq);
 #endif
-       }
 
        return 0;
 }
 
-static void tc3589x_irq_remove(struct tc3589x *tc3589x)
+static void tc3589x_irq_unmap(struct irq_domain *d, unsigned int virq)
 {
-       int base = tc3589x->irq_base;
-       int irq;
-
-       for (irq = base; irq < base + TC3589x_NR_INTERNAL_IRQS; irq++) {
 #ifdef CONFIG_ARM
-               set_irq_flags(irq, 0);
+       set_irq_flags(virq, 0);
 #endif
-               irq_set_chip_and_handler(irq, NULL, NULL);
-               irq_set_chip_data(irq, NULL);
+       irq_set_chip_and_handler(virq, NULL, NULL);
+       irq_set_chip_data(virq, NULL);
+}
+
+static struct irq_domain_ops tc3589x_irq_ops = {
+        .map    = tc3589x_irq_map,
+       .unmap  = tc3589x_irq_unmap,
+        .xlate  = irq_domain_xlate_twocell,
+};
+
+static int tc3589x_irq_init(struct tc3589x *tc3589x, struct device_node *np)
+{
+       int base = tc3589x->irq_base;
+
+       if (base) {
+               tc3589x->domain = irq_domain_add_legacy(
+                       NULL, TC3589x_NR_INTERNAL_IRQS, base,
+                       0, &tc3589x_irq_ops, tc3589x);
+       }
+       else {
+               tc3589x->domain = irq_domain_add_linear(
+                       np, TC3589x_NR_INTERNAL_IRQS,
+                       &tc3589x_irq_ops, tc3589x);
        }
+
+       if (!tc3589x->domain) {
+               dev_err(tc3589x->dev, "Failed to create irqdomain\n");
+               return -ENOSYS;
+       }
+
+       return 0;
 }
 
 static int tc3589x_chip_init(struct tc3589x *tc3589x)
@@ -263,7 +290,7 @@ static int __devinit tc3589x_device_init(struct tc3589x *tc3589x)
        if (blocks & TC3589x_BLOCK_GPIO) {
                ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_gpio,
                                      ARRAY_SIZE(tc3589x_dev_gpio), NULL,
-                                     tc3589x->irq_base, NULL);
+                                     tc3589x->irq_base, tc3589x->domain);
                if (ret) {
                        dev_err(tc3589x->dev, "failed to add gpio child\n");
                        return ret;
@@ -274,7 +301,7 @@ static int __devinit tc3589x_device_init(struct tc3589x *tc3589x)
        if (blocks & TC3589x_BLOCK_KEYPAD) {
                ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_keypad,
                                      ARRAY_SIZE(tc3589x_dev_keypad), NULL,
-                                     tc3589x->irq_base, NULL);
+                                     tc3589x->irq_base, tc3589x->domain);
                if (ret) {
                        dev_err(tc3589x->dev, "failed to keypad child\n");
                        return ret;
@@ -285,13 +312,47 @@ static int __devinit tc3589x_device_init(struct tc3589x *tc3589x)
        return ret;
 }
 
+static int tc3589x_of_probe(struct device_node *np,
+                       struct tc3589x_platform_data *pdata)
+{
+       struct device_node *child;
+
+       for_each_child_of_node(np, child) {
+               if (!strcmp(child->name, "tc3589x_gpio")) {
+                       pdata->block |= TC3589x_BLOCK_GPIO;
+               }
+               if (!strcmp(child->name, "tc3589x_keypad")) {
+                       pdata->block |= TC3589x_BLOCK_KEYPAD;
+               }
+       }
+
+       return 0;
+}
+
 static int __devinit tc3589x_probe(struct i2c_client *i2c,
                                   const struct i2c_device_id *id)
 {
        struct tc3589x_platform_data *pdata = i2c->dev.platform_data;
+       struct device_node *np = i2c->dev.of_node;
        struct tc3589x *tc3589x;
        int ret;
 
+       if (!pdata) {
+               if (np) {
+                       pdata = devm_kzalloc(&i2c->dev, sizeof(*pdata), GFP_KERNEL);
+                       if (!pdata)
+                               return -ENOMEM;
+
+                       ret = tc3589x_of_probe(np, pdata);
+                       if (ret)
+                               return ret;
+               }
+               else {
+                       dev_err(&i2c->dev, "No platform data or DT found\n");
+                       return -EINVAL;
+               }
+       }
+
        if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_SMBUS_BYTE_DATA
                                     | I2C_FUNC_SMBUS_I2C_BLOCK))
                return -EIO;
@@ -314,7 +375,7 @@ static int __devinit tc3589x_probe(struct i2c_client *i2c,
        if (ret)
                goto out_free;
 
-       ret = tc3589x_irq_init(tc3589x);
+       ret = tc3589x_irq_init(tc3589x, np);
        if (ret)
                goto out_free;
 
@@ -323,7 +384,7 @@ static int __devinit tc3589x_probe(struct i2c_client *i2c,
                                   "tc3589x", tc3589x);
        if (ret) {
                dev_err(tc3589x->dev, "failed to request IRQ: %d\n", ret);
-               goto out_removeirq;
+               goto out_free;
        }
 
        ret = tc3589x_device_init(tc3589x);
@@ -336,8 +397,6 @@ static int __devinit tc3589x_probe(struct i2c_client *i2c,
 
 out_freeirq:
        free_irq(tc3589x->i2c->irq, tc3589x);
-out_removeirq:
-       tc3589x_irq_remove(tc3589x);
 out_free:
        kfree(tc3589x);
        return ret;
@@ -350,7 +409,6 @@ static int __devexit tc3589x_remove(struct i2c_client *client)
        mfd_remove_devices(tc3589x->dev);
 
        free_irq(tc3589x->i2c->irq, tc3589x);
-       tc3589x_irq_remove(tc3589x);
 
        kfree(tc3589x);