aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/plat-samsung/s5p-sleep.S8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/s5p-sleep.S b/arch/arm/plat-samsung/s5p-sleep.S
index a030e7301da8..20764bd5518e 100644
--- a/arch/arm/plat-samsung/s5p-sleep.S
+++ b/arch/arm/plat-samsung/s5p-sleep.S
@@ -59,13 +59,15 @@ ENTRY(s3c_cpu_resume)
59 and r0, r0, r1 59 and r0, r0, r1
60 ldr r1, =CPU_CORTEX_A9 60 ldr r1, =CPU_CORTEX_A9
61 cmp r0, r1 61 cmp r0, r1
62 bne resume_l2on 62 bne skip_l2_resume
63 adr r0, l2x0_regs_phys 63 adr r0, l2x0_regs_phys
64 ldr r0, [r0] 64 ldr r0, [r0]
65 cmp r0, #0
66 beq skip_l2_resume
65 ldr r1, [r0, #L2X0_R_PHY_BASE] 67 ldr r1, [r0, #L2X0_R_PHY_BASE]
66 ldr r2, [r1, #L2X0_CTRL] 68 ldr r2, [r1, #L2X0_CTRL]
67 tst r2, #0x1 69 tst r2, #0x1
68 bne resume_l2on 70 bne skip_l2_resume
69 ldr r2, [r0, #L2X0_R_AUX_CTRL] 71 ldr r2, [r0, #L2X0_R_AUX_CTRL]
70 str r2, [r1, #L2X0_AUX_CTRL] 72 str r2, [r1, #L2X0_AUX_CTRL]
71 ldr r2, [r0, #L2X0_R_TAG_LATENCY] 73 ldr r2, [r0, #L2X0_R_TAG_LATENCY]
@@ -78,7 +80,7 @@ ENTRY(s3c_cpu_resume)
78 str r2, [r1, #L2X0_POWER_CTRL] 80 str r2, [r1, #L2X0_POWER_CTRL]
79 mov r2, #1 81 mov r2, #1
80 str r2, [r1, #L2X0_CTRL] 82 str r2, [r1, #L2X0_CTRL]
81resume_l2on: 83skip_l2_resume:
82#endif 84#endif
83 b cpu_resume 85 b cpu_resume
84ENDPROC(s3c_cpu_resume) 86ENDPROC(s3c_cpu_resume)