Merge tag 'mvebu-soc-suspend-3.19' of git://git.infradead.org/linux-mvebu into next/soc

[mirror_ubuntu-artful-kernel.git] / arch / arm / mach-mvebu / pmsu_ll.S

diff --git a/arch/arm/mach-mvebu/pmsu_ll.S b/arch/arm/mach-mvebu/pmsu_ll.S
index 83d014698314a36827574e8256021e7fa2eed51f..88651221dbdd74270cc98f0ed5647120bc77018b 100644 (file)
--- 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