diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-28 20:29:18 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-28 20:29:18 +0200 |
| commit | aaf75e454cc5e16e7f24bd87590b2d882ddb1671 (patch) | |
| tree | 0260f84da58f68a55c467fdd9cfde6b43acc9e22 /include | |
| parent | Linux 3.11-rc6 (diff) | |
| parent | cpuidle: big.LITTLE: vexpress-TC2 CPU idle driver (diff) | |
| download | linux-aaf75e454cc5e16e7f24bd87590b2d882ddb1671.tar.xz linux-aaf75e454cc5e16e7f24bd87590b2d882ddb1671.zip | |
Merge branch 'cpuidle/biglittle' into next/drivers
From Lorenzo Pieralisi:
This patch series contains:
- GIC driver update to add a method to disable the GIC CPU IF
- TC2 MCPM update to add GIC CPU disabling to suspend method
- TC2 CPU idle big.LITTLE driver
* cpuidle/biglittle:
cpuidle: big.LITTLE: vexpress-TC2 CPU idle driver
ARM: vexpress: tc2: disable GIC CPU IF in tc2_pm_suspend
drivers: irq-chip: irq-gic: introduce gic_cpu_if_down()
ARM: vexpress/TC2: implement PM suspend method
ARM: vexpress/TC2: basic PM support
ARM: vexpress: Add SCC to V2P-CA15_A7's device tree
ARM: vexpress/TC2: add Serial Power Controller (SPC) support
ARM: vexpress/dcscb: fix cache disabling sequences
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/irqchip/arm-gic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h index 3e203eb23cc7..0e5d9ecdb2b6 100644 --- a/include/linux/irqchip/arm-gic.h +++ b/include/linux/irqchip/arm-gic.h @@ -66,6 +66,7 @@ extern struct irq_chip gic_arch_extn; void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *, u32 offset, struct device_node *); void gic_cascade_irq(unsigned int gic_nr, unsigned int irq); +void gic_cpu_if_down(void); static inline void gic_init(unsigned int nr, int start, void __iomem *dist , void __iomem *cpu) |