Merge branch 'irq/gic-v2m-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull another round of GIC changes from Marc:

 ACPI support for GIV-v2m

diff --cc drivers/irqchip/irq-gic-v2m.c
index ee1e553,7e2975d..e2d2d02
--- 1/drivers/irqchip/irq-gic-v2m.c
--- 2/drivers/irqchip/irq-gic-v2m.c
+++ b/drivers/irqchip/irq-gic-v2m.c
@@@ -387,9 -397,21 +397,21 @@@ static int __init gicv2m_of_init(struc
                if (!of_find_property(child, "msi-controller", NULL))
                        continue;
  
-               ret = gicv2m_init_one(child, parent);
+               ret = of_address_to_resource(child, 0, &res);
+               if (ret) {
+                       pr_err("Failed to allocate v2m resource.\n");
+                       break;
+               }
+ 
+               if (!of_property_read_u32(child, "arm,msi-base-spi",
+                                         &spi_start) &&
+                   !of_property_read_u32(child, "arm,msi-num-spis", &nr_spis))
+                       pr_info("DT overriding V2M MSI_TYPER (base:%u, num:%u)\n",
+                               spi_start, nr_spis);
+ 
+               ret = gicv2m_init_one(&child->fwnode, spi_start, nr_spis, &res);
                if (ret) {
 -                      of_node_put(node);
 +                      of_node_put(child);
                        break;
                }
        }

diff --cc drivers/irqchip/irq-gic.c
Simple merge

diff --cc include/linux/irqchip/arm-gic.h
Simple merge

diff --cc include/linux/irqdomain.h
Simple merge

diff --cc kernel/irq/irqdomain.c
Simple merge