diff options
-rw-r--r-- | arch/arm/plat-s3c24xx/sleep.S | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/arch/arm/plat-s3c24xx/sleep.S b/arch/arm/plat-s3c24xx/sleep.S index 2018c2e1dcc5..435349dc3243 100644 --- a/arch/arm/plat-s3c24xx/sleep.S +++ b/arch/arm/plat-s3c24xx/sleep.S | |||
@@ -64,11 +64,10 @@ ENTRY(s3c2410_cpu_save) | |||
64 | 64 | ||
65 | @@ store co-processor registers | 65 | @@ store co-processor registers |
66 | 66 | ||
67 | mrc p15, 0, r4, c15, c1, 0 @ CP access register | 67 | mrc p15, 0, r4, c13, c0, 0 @ PID |
68 | mrc p15, 0, r5, c13, c0, 0 @ PID | 68 | mrc p15, 0, r5, c3, c0, 0 @ Domain ID |
69 | mrc p15, 0, r6, c3, c0, 0 @ Domain ID | 69 | mrc p15, 0, r6, c2, c0, 0 @ translation table base address |
70 | mrc p15, 0, r7, c2, c0, 0 @ translation table base address | 70 | mrc p15, 0, r7, c1, c0, 0 @ control register |
71 | mrc p15, 0, r8, c1, c0, 0 @ control register | ||
72 | 71 | ||
73 | stmia r0, { r4 - r13 } | 72 | stmia r0, { r4 - r13 } |
74 | 73 | ||
@@ -141,10 +140,9 @@ ENTRY(s3c2410_cpu_resume) | |||
141 | ldr r0, s3c2410_sleep_save_phys @ address of restore block | 140 | ldr r0, s3c2410_sleep_save_phys @ address of restore block |
142 | ldmia r0, { r4 - r13 } | 141 | ldmia r0, { r4 - r13 } |
143 | 142 | ||
144 | mcr p15, 0, r4, c15, c1, 0 @ CP access register | 143 | mcr p15, 0, r4, c13, c0, 0 @ PID |
145 | mcr p15, 0, r5, c13, c0, 0 @ PID | 144 | mcr p15, 0, r5, c3, c0, 0 @ Domain ID |
146 | mcr p15, 0, r6, c3, c0, 0 @ Domain ID | 145 | mcr p15, 0, r6, c2, c0, 0 @ translation table base |
147 | mcr p15, 0, r7, c2, c0, 0 @ translation table base | ||
148 | 146 | ||
149 | #ifdef CONFIG_DEBUG_RESUME | 147 | #ifdef CONFIG_DEBUG_RESUME |
150 | mov r3, #'R' | 148 | mov r3, #'R' |
@@ -152,7 +150,7 @@ ENTRY(s3c2410_cpu_resume) | |||
152 | #endif | 150 | #endif |
153 | 151 | ||
154 | ldr r2, =resume_with_mmu | 152 | ldr r2, =resume_with_mmu |
155 | mcr p15, 0, r8, c1, c0, 0 @ turn on MMU, etc | 153 | mcr p15, 0, r7, c1, c0, 0 @ turn on MMU, etc |
156 | nop @ second-to-last before mmu | 154 | nop @ second-to-last before mmu |
157 | mov pc, r2 @ go back to virtual address | 155 | mov pc, r2 @ go back to virtual address |
158 | 156 | ||