aboutsummaryrefslogtreecommitdiff
path: root/drivers/irqchip/irq-gic.c
diff options
context:
space:
mode:
authorJon Medhurst <tixy@linaro.org>2013-05-09 14:07:03 +0100
committerJon Medhurst <tixy@linaro.org>2013-05-09 14:07:03 +0100
commitc5b970dd2f809ce3675902f672a1d676aed43c7a (patch)
tree89311b14d29ab1d8ea2966e22941ac5b2214db25 /drivers/irqchip/irq-gic.c
parent3bc528d32c5c98a496c3473353e701a6e23c0cb3 (diff)
parent892404cc9460bdc9156ec0ca3ac27c6f20539213 (diff)
Merge branch 'tracking-armlt-tc2-pm' into lsk-3.9-vexpress
Conflicts: arch/arm/mach-vexpress/Kconfig arch/arm/mach-vexpress/Makefile
Diffstat (limited to 'drivers/irqchip/irq-gic.c')
-rw-r--r--drivers/irqchip/irq-gic.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 487caf473b6..e2931de32e6 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -453,6 +453,12 @@ static void __cpuinit gic_cpu_init(struct gic_chip_data *gic)
writel_relaxed(1, base + GIC_CPU_CTRL);
}
+void gic_cpu_if_down(void)
+{
+ void __iomem *cpu_base = gic_data_cpu_base(&gic_data[0]);
+ writel_relaxed(0, cpu_base + GIC_CPU_CTRL);
+}
+
#ifdef CONFIG_CPU_PM
/*
* Saves the GIC distributor registers during suspend or idle. Must be called