[GIT PULL] GIC DT binding support

[Arnd Bergmann]

On Thursday 20 October 2011 18:12:28 Arnd Bergmann wrote:
> I've now rebased your tree on top of 3.1-rc9 plus the stable branches
> from Russell's tree that I already have as dependencies in arm-soc/for-next
> (devel-stable, smp, debug). This has caused no conflicts for me, but
> that doesn't mean that it's correct. Please check that what I have
> in arm-soc/dt/gic and arm-soc/highbank/soc actually works for you
> and does not contain branches that you don't actually need.

I needed this patch in the end:

8<-----
ARM: gic: fix build error with CONFIG_IRQ_DOMAIN disabled

In file included from arch/arm/mach-msm/timer.c:26:0:
asm/hardware/gic.h:42:50: warning: 'struct device_node' declared inside parameter list [enabled by default]
asm/hardware/gic.h:42:50: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default]
asm/hardware/gic.h:58:20: error: field 'domain' has incomplete type

Signed-off-by: Arnd Bergmann <arnd at arndb.de>
---
Ok to apply on top?

diff --git a/arch/arm/include/asm/hardware/gic.h b/arch/arm/include/asm/hardware/gic.h
index 1a776a1..a06c3ac 100644
--- a/arch/arm/include/asm/hardware/gic.h
+++ b/arch/arm/include/asm/hardware/gic.h
@@ -35,6 +35,8 @@
 #ifndef __ASSEMBLY__
 #include <linux/irqdomain.h>
 
+struct device_node;
+
 extern void __iomem *gic_cpu_base_addr;
 extern struct irq_chip gic_arch_extn;
 
@@ -55,7 +57,9 @@ struct gic_chip_data {
 	u32 __percpu *saved_ppi_enable;
 	u32 __percpu *saved_ppi_conf;
 #endif
+#ifdef CONFIG_IRQ_DOMAIN
 	struct irq_domain domain;
+#endif
 	unsigned int gic_irqs;
 };
 #endif