From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 29 Dec 2015 09:08:45 +0000 (+0100)
Subject: Merge branch 'irq/gic-v2m-acpi' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=92b86f92ed0307efbaea3c0e95520551848d3995;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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

Pull another round of GIC changes from Marc:

 ACPI support for GIV-v2m
---

92b86f92ed0307efbaea3c0e95520551848d3995
diff --cc drivers/irqchip/irq-gic-v2m.c
index ee1e553ee7a6,7e2975df4473..e2d2d027637d
--- a/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;
  		}
  	}