mfd: Move twl-core IRQ allocation into twl[4030|6030]-irq files

During DT adaptation, the irq_alloc_desc was added into twl-core, but
due to the rather different and weird IRQ management required by the twl4030,
it is much better to have a different approach for it.
The issue is that twl4030 uses a two level IRQ mechanism but handles all the
PWR interrupts as part of the twl-core interrupt range. It ends up with a
range of 16 interrupts total for CORE and PWR.

The other twl4030 functionalities already have a dedicated driver and thus
their IRQs and irqdomain can and should be defined localy.

twl6030 is using a single level IRQ controller and thus does not require any
trick.

Move the irq_alloc_desc and irq_domain_add_legacy in twl4030-irq and
twl6030-irq.

Allocate together CORE and PWR IRQs for twl4030-irq.

Conflicts:

        drivers/mfd/twl-core.c

Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 5 insertions, 24 deletions

diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c
index 712e262ba99..764c5b5d914 100644
--- a/drivers/mfd/twl-core.c
+++ b/drivers/mfd/twl-core.c
@@ -147,9 +147,6 @@
 
 #define TWL_MODULE_LAST TWL4030_MODULE_LAST
 
-#define TWL4030_NR_IRQS    8
-#define TWL6030_NR_IRQS    20
-
 /* Base Address defns for twl4030_map[] */
 
 /* subchip/slave 0 - USB ID */
@@ -1186,17 +1183,12 @@ static int __devinit
 twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
         int                             irq_base;
-        int                             irq_end;
         int                             status;
         unsigned                        i;
         struct twl4030_platform_data    *pdata = client->dev.platform_data;
         struct device_node              *node = client->dev.of_node;
         u8 temp;
         int ret = 0;
-        int nr_irqs = TWL4030_NR_IRQS;
-
-        if ((id->driver_data) & TWL6030_CLASS)
-                nr_irqs = TWL6030_NR_IRQS;
 
         if (node && !pdata) {
                 /*
@@ -1215,17 +1207,6 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 return -EINVAL;
         }
 
-        status = irq_alloc_descs(-1, 0, nr_irqs, 0);
-        if (IS_ERR_VALUE(status)) {
-                dev_err(&client->dev, "Fail to allocate IRQ descs\n");
-                return status;
-        }
-
-        irq_base = status;
-        irq_end = irq_base + nr_irqs;
-        irq_domain_add_legacy(node, nr_irqs, irq_base, 0,
-                              &irq_domain_simple_ops, NULL);
-
         if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C) == 0) {
                 dev_dbg(&client->dev, "can't talk I2C?\n");
                 return -EIO;
@@ -1280,15 +1261,15 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id)
         if (client->irq) {
                 if (twl_class_is_4030()) {
                         twl4030_init_chip_irq(id->name);
-                        status = twl4030_init_irq(client->irq, irq_base,
-                        irq_end);
+                        irq_base = twl4030_init_irq(&client->dev, client->irq);
                 } else {
-                        status = twl6030_init_irq(client->irq, irq_base,
-                        irq_end);
+                        irq_base = twl6030_init_irq(&client->dev, client->irq);
                 }
 
-                if (status < 0)
+                if (irq_base < 0) {
+                        status = irq_base;
                         goto fail;
+                }
         }
 
         /* Disable TWL4030/TWL5030 I2C Pull-up on I2C1 and I2C4(SR) interface.