diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 14:16:20 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2015-12-19 14:16:20 +0300 |
| commit | 4e8dbe9e93436bcf326adbab7f9761dd8e4ecbfc (patch) | |
| tree | 128f3a2a1cc33dddc3a0522185acb48d12c1b6ee /include | |
| parent | ef0bf620e9b81845368b9c72ffdbd6834e424526 (diff) | |
| parent | a27d21e03eb14a63dae12467a7655be3334ac80c (diff) | |
| download | linux-4e8dbe9e93436bcf326adbab7f9761dd8e4ecbfc.tar.xz | |
Merge branch 'irq/gic-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull the GIC related updates from Marc Zyngier:
"Not a lot this time (what a relief!), but an interesting series from
Linus Walleij coming out of his work converting the ARM RealView
platforms to DT, and a couple of mundane fixes."
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqchip/arm-gic.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index bae69e5d693c..d0a29db73bc7 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -103,6 +103,16 @@ struct device_node; void gic_cascade_irq(unsigned int gic_nr, unsigned int irq); int gic_cpu_if_down(unsigned int gic_nr); +/* + * Subdrivers that need some preparatory work can initialize their + * chips and call this to register their GICs. + */ +int gic_of_init(struct device_node *node, struct device_node *parent); + +/* + * Legacy platforms not converted to DT yet must use this to init + * their GIC + */ void gic_init(unsigned int nr, int start, void __iomem *dist , void __iomem *cpu); |