Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[platform/kernel/linux-rpi.git] / drivers / mfd / tps6586x.c

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 87ba7ad..721b918 100644 (file)
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -17,12 +17,14 @@
 
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/irqdomain.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/i2c.h>
+#include <linux/platform_device.h>
 #include <linux/regmap.h>
 
 #include <linux/mfd/core.h>
@@ -92,6 +94,14 @@ static const struct tps6586x_irq_data tps6586x_irqs[] = {
        [TPS6586X_INT_RTC_ALM2] = TPS6586X_IRQ(TPS6586X_INT_MASK4, 1 << 1),
 };
 
+static struct resource tps6586x_rtc_resources[] = {
+       {
+               .start  = TPS6586X_INT_RTC_ALM1,
+               .end    = TPS6586X_INT_RTC_ALM1,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
 static struct mfd_cell tps6586x_cell[] = {
        {
                .name = "tps6586x-gpio",
@@ -101,6 +111,8 @@ static struct mfd_cell tps6586x_cell[] = {
        },
        {
                .name = "tps6586x-rtc",
+               .num_resources = ARRAY_SIZE(tps6586x_rtc_resources),
+               .resources = &tps6586x_rtc_resources[0],
        },
        {
                .name = "tps6586x-onkey",
@@ -117,6 +129,7 @@ struct tps6586x {
        int                     irq_base;
        u32                     irq_en;
        u8                      mask_reg[5];
+       struct irq_domain       *irq_domain;
 };
 
 static inline struct tps6586x *dev_to_tps6586x(struct device *dev)
@@ -185,6 +198,14 @@ int tps6586x_update(struct device *dev, int reg, uint8_t val, uint8_t mask)
 }
 EXPORT_SYMBOL_GPL(tps6586x_update);
 
+int tps6586x_irq_get_virq(struct device *dev, int irq)
+{
+       struct tps6586x *tps6586x = dev_to_tps6586x(dev);
+
+       return irq_create_mapping(tps6586x->irq_domain, irq);
+}
+EXPORT_SYMBOL_GPL(tps6586x_irq_get_virq);
+
 static int __remove_subdev(struct device *dev, void *unused)
 {
        platform_device_unregister(to_platform_device(dev));
@@ -206,7 +227,7 @@ static void tps6586x_irq_lock(struct irq_data *data)
 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;
+       unsigned int __irq = irq_data->hwirq;
        const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq];
 
        tps6586x->mask_reg[data->mask_reg] &= ~data->mask_mask;
@@ -217,7 +238,7 @@ 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;
+       unsigned int __irq = irq_data->hwirq;
        const struct tps6586x_irq_data *data = &tps6586x_irqs[__irq];
 
        tps6586x->mask_reg[data->mask_reg] |= data->mask_mask;
@@ -240,6 +261,39 @@ static void tps6586x_irq_sync_unlock(struct irq_data *data)
        mutex_unlock(&tps6586x->irq_lock);
 }
 
+static struct irq_chip tps6586x_irq_chip = {
+       .name = "tps6586x",
+       .irq_bus_lock = tps6586x_irq_lock,
+       .irq_bus_sync_unlock = tps6586x_irq_sync_unlock,
+       .irq_disable = tps6586x_irq_disable,
+       .irq_enable = tps6586x_irq_enable,
+};
+
+static int tps6586x_irq_map(struct irq_domain *h, unsigned int virq,
+                               irq_hw_number_t hw)
+{
+       struct tps6586x *tps6586x = h->host_data;
+
+       irq_set_chip_data(virq, tps6586x);
+       irq_set_chip_and_handler(virq, &tps6586x_irq_chip, handle_simple_irq);
+       irq_set_nested_thread(virq, 1);
+
+       /* ARM needs us to explicitly flag the IRQ as valid
+        * and will set them noprobe when we do so. */
+#ifdef CONFIG_ARM
+       set_irq_flags(virq, IRQF_VALID);
+#else
+       irq_set_noprobe(virq);
+#endif
+
+       return 0;
+}
+
+static struct irq_domain_ops tps6586x_domain_ops = {
+       .map    = tps6586x_irq_map,
+       .xlate  = irq_domain_xlate_twocell,
+};
+
 static irqreturn_t tps6586x_irq(int irq, void *data)
 {
        struct tps6586x *tps6586x = data;
@@ -260,7 +314,8 @@ static irqreturn_t tps6586x_irq(int irq, void *data)
                int i = __ffs(acks);
 
                if (tps6586x->irq_en & (1 << i))
-                       handle_nested_irq(tps6586x->irq_base + i);
+                       handle_nested_irq(
+                               irq_find_mapping(tps6586x->irq_domain, i));
 
                acks &= ~(1 << i);
        }
@@ -273,11 +328,8 @@ static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
 {
        int i, ret;
        u8 tmp[4];
-
-       if (!irq_base) {
-               dev_warn(tps6586x->dev, "No interrupt support on IRQ base\n");
-               return -EINVAL;
-       }
+       int new_irq_base;
+       int irq_num = ARRAY_SIZE(tps6586x_irqs);
 
        mutex_init(&tps6586x->irq_lock);
        for (i = 0; i < 5; i++) {
@@ -287,25 +339,24 @@ static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
 
        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
+       if  (irq_base > 0) {
+               new_irq_base = irq_alloc_descs(irq_base, 0, irq_num, -1);
+               if (new_irq_base < 0) {
+                       dev_err(tps6586x->dev,
+                               "Failed to alloc IRQs: %d\n", new_irq_base);
+                       return new_irq_base;
+               }
+       } else {
+               new_irq_base = 0;
        }
 
+       tps6586x->irq_domain = irq_domain_add_simple(tps6586x->dev->of_node,
+                               irq_num, new_irq_base, &tps6586x_domain_ops,
+                               tps6586x);
+       if (!tps6586x->irq_domain) {
+               dev_err(tps6586x->dev, "Failed to create IRQ domain\n");
+               return -ENOMEM;
+       }
        ret = request_threaded_irq(irq, NULL, tps6586x_irq, IRQF_ONESHOT,
                                   "tps6586x", tps6586x);
 
@@ -461,7 +512,7 @@ static int tps6586x_i2c_probe(struct i2c_client *client,
 
        ret = mfd_add_devices(tps6586x->dev, -1,
                              tps6586x_cell, ARRAY_SIZE(tps6586x_cell),
-                             NULL, 0, NULL);
+                             NULL, 0, tps6586x->irq_domain);
        if (ret < 0) {
                dev_err(&client->dev, "mfd_add_devices failed: %d\n", ret);
                goto err_mfd_add;