1 files changed, 23 insertions, 9 deletions

diff --git a/drivers/mfd/twl6040-irq.c b/drivers/mfd/twl6040-irq.c
index b3f8ddaa28a..4b42543da22 100644
--- a/drivers/mfd/twl6040-irq.c
+++ b/drivers/mfd/twl6040-irq.c
@@ -23,7 +23,10 @@
 
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/err.h>
 #include <linux/irq.h>
+#include <linux/of.h>
+#include <linux/irqdomain.h>
 #include <linux/interrupt.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/twl6040.h>
@@ -138,7 +141,8 @@ static irqreturn_t twl6040_irq_thread(int irq, void *data)
 
 int twl6040_irq_init(struct twl6040 *twl6040)
 {
-        int cur_irq, ret;
+        struct device_node *node = twl6040->dev->of_node;
+        int i, nr_irqs, irq_base, ret;
         u8 val;
 
         mutex_init(&twl6040->irq_mutex);
@@ -148,21 +152,31 @@ int twl6040_irq_init(struct twl6040 *twl6040)
         twl6040->irq_masks_cache = TWL6040_ALLINT_MSK;
         twl6040_reg_write(twl6040, TWL6040_REG_INTMR, TWL6040_ALLINT_MSK);
 
+        nr_irqs = ARRAY_SIZE(twl6040_irqs);
+
+        irq_base = irq_alloc_descs(-1, 0, nr_irqs, 0);
+        if (IS_ERR_VALUE(irq_base)) {
+                dev_err(twl6040->dev, "Fail to allocate IRQ descs\n");
+                return irq_base;
+        }
+        twl6040->irq_base = irq_base;
+
+        irq_domain_add_legacy(node, ARRAY_SIZE(twl6040_irqs), irq_base, 0,
+                              &irq_domain_simple_ops, NULL);
+
         /* Register them with genirq */
-        for (cur_irq = twl6040->irq_base;
-             cur_irq < twl6040->irq_base + ARRAY_SIZE(twl6040_irqs);
-             cur_irq++) {
-                irq_set_chip_data(cur_irq, twl6040);
-                irq_set_chip_and_handler(cur_irq, &twl6040_irq_chip,
+        for (i = irq_base; i < irq_base + nr_irqs; i++) {
+                irq_set_chip_data(i, twl6040);
+                irq_set_chip_and_handler(i, &twl6040_irq_chip,
                                          handle_level_irq);
-                irq_set_nested_thread(cur_irq, 1);
+                irq_set_nested_thread(i, 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(cur_irq, IRQF_VALID);
+                set_irq_flags(i, IRQF_VALID);
 #else
-                irq_set_noprobe(cur_irq);
+                irq_set_noprobe(i);
 #endif
         }