diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 16:46:43 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 16:46:43 +0100 |
| commit | ab64920c3742ba992a3bf0b06f9750d1cad9d050 (patch) | |
| tree | 3391e85b0bb7372d7d34775047e9d8c894042938 /arch/arm/mach-mvebu/pmsu.h | |
| parent | 756f80cee766574ae282baa97fdcf9cc6d0cc70c (diff) | |
| parent | 6e6db2bea3ea9424a0cb19d89d47664bc13e31bc (diff) | |
| download | talos-obmc-linux-ab64920c3742ba992a3bf0b06f9750d1cad9d050.tar.gz talos-obmc-linux-ab64920c3742ba992a3bf0b06f9750d1cad9d050.zip | |
Merge tag 'mvebu-soc-suspend-3.19' of git://git.infradead.org/linux-mvebu into next/soc
Pull "mvebu SoC suspend changes for v3.19" from Jason Cooper:
- Armada 370/XP suspend/resume support
- mvebu SoC driver suspend/resume support
- irqchip
- clocksource
- mbus
- clk
* tag 'mvebu-soc-suspend-3.19' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: add SDRAM controller description for Armada XP
ARM: mvebu: adjust mbus controller description on Armada 370/XP
ARM: mvebu: add suspend/resume DT information for Armada XP GP
ARM: mvebu: synchronize secondary CPU clocks on resume
ARM: mvebu: make sure MMU is disabled in armada_370_xp_cpu_resume
ARM: mvebu: Armada XP GP specific suspend/resume code
ARM: mvebu: reserve the first 10 KB of each memory bank for suspend/resume
ARM: mvebu: implement suspend/resume support for Armada XP
clk: mvebu: add suspend/resume for gatable clocks
bus: mvebu-mbus: provide a mechanism to save SDRAM window configuration
bus: mvebu-mbus: suspend/resume support
clocksource: time-armada-370-xp: add suspend/resume support
irqchip: armada-370-xp: Add suspend/resume support
Documentation: dt-bindings: minimal documentation for MVEBU SDRAM controller
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-mvebu/pmsu.h')
| -rw-r--r-- | arch/arm/mach-mvebu/pmsu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/pmsu.h b/arch/arm/mach-mvebu/pmsu.h index c2c95db4f648..ea79269c2702 100644 --- a/arch/arm/mach-mvebu/pmsu.h +++ b/arch/arm/mach-mvebu/pmsu.h @@ -17,6 +17,7 @@ int mvebu_setup_boot_addr_wa(unsigned int crypto_eng_target, phys_addr_t resume_addr_reg); void mvebu_v7_pmsu_idle_exit(void); +void armada_370_xp_cpu_resume(void); int armada_370_xp_pmsu_idle_enter(unsigned long deepidle); int armada_38x_do_cpu_suspend(unsigned long deepidle); |
