From: Colin Cross <ccross@android.com>
Date: Mon, 13 Jun 2011 00:45:59 +0000 (+0000)
Subject: ARM: gic: Allow gic arch extensions to provide irqchip flags
X-Git-Tag: MMI-PSA29.97-13-9~18195^2~4^2~2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c12845ee49716209cb2b087c0b47c3e37096bde;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ARM: gic: Allow gic arch extensions to provide irqchip flags

Tegra can benefit from the IRQCHIP_MASK_ON_SUSPEND flag, allow it
to be passed to the gic irq chip.

Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Kevin Hilman <khilman@ti.com>
Tested-and-Acked-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Vishwanath BS <vishwanath.bs@ti.com>
---

diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c
index 66c7c4820108..734db99eaee7 100644
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
@@ -544,6 +544,7 @@ void __init gic_init(unsigned int gic_nr, unsigned int irq_start,
 	if (gic_nr == 0)
 		gic_cpu_base_addr = cpu_base;
 
+	gic_chip.flags |= gic_arch_extn.flags;
 	gic_dist_init(gic, irq_start);
 	gic_cpu_init(gic);
 	gic_pm_init(gic);