irqchip: Convert all alloc/xlate users from of_node to fwnode

Since we now have a generic data structure to express an
interrupt specifier, convert all hierarchical irqchips that
are OF based to use a fwnode_handle as part of their alloc
and xlate (which becomes translate) callbacks.

As most of these drivers have dependencies (they exchange IRQ
specifiers), change them all in a single, massive patch...

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-and-tested-by: Hanjun Guo <hanjun.guo@linaro.org>
Tested-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: <linux-arm-kernel@lists.infradead.org>
Cc: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Graeme Gregory <graeme@xora.org.uk>
Cc: Jake Oshins <jakeo@microsoft.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Link: http://lkml.kernel.org/r/1444737105-31573-6-git-send-email-marc.zyngier@arm.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 29 insertions, 13 deletions

diff --git a/drivers/irqchip/irq-vf610-mscm-ir.c b/drivers/irqchip/irq-vf610-mscm-ir.c
index ae82d7e15c63..56b5e3cb9de2 100644
--- a/drivers/irqchip/irq-vf610-mscm-ir.c
+++ b/drivers/irqchip/irq-vf610-mscm-ir.c
@@ -130,35 +130,51 @@ static int vf610_mscm_ir_domain_alloc(struct irq_domain *domain, unsigned int vi
 {
         int i;
         irq_hw_number_t hwirq;
-        struct of_phandle_args *irq_data = arg;
-        struct of_phandle_args gic_data;
+        struct irq_fwspec *fwspec = arg;
+        struct irq_fwspec parent_fwspec;
 
-        if (irq_data->args_count != 2)
+        if (!irq_domain_get_of_node(domain->parent))
                 return -EINVAL;
 
-        hwirq = irq_data->args[0];
+        if (fwspec->param_count != 2)
+                return -EINVAL;
+
+        hwirq = fwspec->param[0];
         for (i = 0; i < nr_irqs; i++)
                 irq_domain_set_hwirq_and_chip(domain, virq + i, hwirq + i,
                                               &vf610_mscm_ir_irq_chip,
                                               domain->host_data);
 
-        gic_data.np = irq_domain_get_of_node(domain->parent);
+        parent_fwspec.fwnode = domain->parent->fwnode;
 
         if (mscm_ir_data->is_nvic) {
-                gic_data.args_count = 1;
-                gic_data.args[0] = irq_data->args[0];
+                parent_fwspec.param_count = 1;
+                parent_fwspec.param[0] = fwspec->param[0];
         } else {
-                gic_data.args_count = 3;
-                gic_data.args[0] = GIC_SPI;
-                gic_data.args[1] = irq_data->args[0];
-                gic_data.args[2] = irq_data->args[1];
+                parent_fwspec.param_count = 3;
+                parent_fwspec.param[0] = GIC_SPI;
+                parent_fwspec.param[1] = fwspec->param[0];
+                parent_fwspec.param[2] = fwspec->param[1];
         }
 
-        return irq_domain_alloc_irqs_parent(domain, virq, nr_irqs, &gic_data);
+        return irq_domain_alloc_irqs_parent(domain, virq, nr_irqs,
+                                            &parent_fwspec);
+}
+
+static int vf610_mscm_ir_domain_translate(struct irq_domain *d,
+                                          struct irq_fwspec *fwspec,
+                                          unsigned long *hwirq,
+                                          unsigned int *type)
+{
+        if (WARN_ON(fwspec->param_count < 2))
+                return -EINVAL;
+        *hwirq = fwspec->param[0];
+        *type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK;
+        return 0;
 }
 
 static const struct irq_domain_ops mscm_irq_domain_ops = {
-        .xlate = irq_domain_xlate_twocell,
+        .translate = vf610_mscm_ir_domain_translate,
         .alloc = vf610_mscm_ir_domain_alloc,
         .free = irq_domain_free_irqs_common,
 };