Merge branch 'irq/gic-v2m-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core

Pull another round of GIC changes from Marc:

 ACPI support for GIV-v2m

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index fcbe0b90870d..911758c056c1 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -957,7 +957,7 @@ static int gic_irq_domain_translate(struct irq_domain *d,
                 return 0;
         }
 
-        if (fwspec->fwnode->type == FWNODE_IRQCHIP) {
+        if (is_fwnode_irqchip(fwspec->fwnode)) {
                 if(fwspec->param_count != 2)
                         return -EINVAL;
 
@@ -1228,7 +1228,7 @@ gic_of_init(struct device_node *node, struct device_node *parent)
         }
 
         if (IS_ENABLED(CONFIG_ARM_GIC_V2M))
-                gicv2m_of_init(node, gic_data[gic_cnt].domain);
+                gicv2m_init(&node->fwnode, gic_data[gic_cnt].domain);
 
         gic_cnt++;
         return 0;
@@ -1353,6 +1353,10 @@ static int __init gic_v2_acpi_init(struct acpi_subtable_header *header,
         __gic_init_bases(0, -1, dist_base, cpu_base, 0, domain_handle);
 
         acpi_set_irq_model(ACPI_IRQ_MODEL_GIC, domain_handle);
+
+        if (IS_ENABLED(CONFIG_ARM_GIC_V2M))
+                gicv2m_init(NULL, gic_data[0].domain);
+
         return 0;
 }
 IRQCHIP_ACPI_DECLARE(gic_v2, ACPI_MADT_TYPE_GENERIC_DISTRIBUTOR,