diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 18:46:43 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-12-04 18:46:43 +0300 |
| commit | ab64920c3742ba992a3bf0b06f9750d1cad9d050 (patch) | |
| tree | 3391e85b0bb7372d7d34775047e9d8c894042938 /arch/arm/mach-mvebu/pmsu_ll.S | |
| parent | 756f80cee766574ae282baa97fdcf9cc6d0cc70c (diff) | |
| parent | 6e6db2bea3ea9424a0cb19d89d47664bc13e31bc (diff) | |
| download | linux-ab64920c3742ba992a3bf0b06f9750d1cad9d050.tar.xz | |
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_ll.S')
| -rw-r--r-- | arch/arm/mach-mvebu/pmsu_ll.S | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S index 83d014698314..88651221dbdd 100644 --- a/arch/arm/mach-mvebu/pmsu_ll.S +++ b/arch/arm/mach-mvebu/pmsu_ll.S @@ -30,6 +30,14 @@ ENDPROC(armada_38x_scu_power_up) */ ENTRY(armada_370_xp_cpu_resume) ARM_BE8(setend be ) @ go BE8 if entered LE + /* + * Disable the MMU that might have been enabled in BootROM if + * this code is used in the resume path of a suspend/resume + * cycle. + */ + mrc p15, 0, r1, c1, c0, 0 + bic r1, #1 + mcr p15, 0, r1, c1, c0, 0 bl ll_add_cpu_to_smp_group bl ll_enable_coherency b cpu_resume |