diff options
| -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 a945756cfb45..ae7e6b06fadc 100644 --- a/arch/arm/mach-mvebu/pmsu_ll.S +++ b/arch/arm/mach-mvebu/pmsu_ll.S | |||
| @@ -18,6 +18,14 @@ | |||
| 18 | */ | 18 | */ |
| 19 | ENTRY(armada_370_xp_cpu_resume) | 19 | ENTRY(armada_370_xp_cpu_resume) |
| 20 | ARM_BE8(setend be ) @ go BE8 if entered LE | 20 | ARM_BE8(setend be ) @ go BE8 if entered LE |
| 21 | /* | ||
| 22 | * Disable the MMU that might have been enabled in BootROM if | ||
| 23 | * this code is used in the resume path of a suspend/resume | ||
| 24 | * cycle. | ||
| 25 | */ | ||
| 26 | mrc p15, 0, r1, c1, c0, 0 | ||
| 27 | bic r1, #1 | ||
| 28 | mcr p15, 0, r1, c1, c0, 0 | ||
| 21 | bl ll_add_cpu_to_smp_group | 29 | bl ll_add_cpu_to_smp_group |
| 22 | bl ll_enable_coherency | 30 | bl ll_enable_coherency |
| 23 | b cpu_resume | 31 | b cpu_resume |