aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-22 07:54:41 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-06-24 03:48:45 -0400
commit2637ce30e145557bf89ebcf35b2d78e729e16e5a (patch)
treeb670a00b7d6047b7225c988d8787e358d82a9ead /arch/arm/mach-omap2
parent857c1b81f8dd2e2a97d859d7e53dd955e2ab55af (diff)
ARM: pm: omap34xx: remove misleading comment and use of r9
The code alludes to r9 being used to indicate what was lost over the suspend/resume transition. However, although r9 is set, it is never actually used. Also, the comments before the code (which refer to the value of r9) and the comments against the assignment of r9 contradict each other, so just remove them to avoid confusion. Reviewed-by: Kevin Hilman <khilman@ti.com> Tested-by: Kevin Hilman <khilman@ti.com> Acked-by: Jean Pihet <j-pihet@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/sleep34xx.S9
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
index 9551c7dc71ef..12e9da2f0263 100644
--- a/arch/arm/mach-omap2/sleep34xx.S
+++ b/arch/arm/mach-omap2/sleep34xx.S
@@ -381,18 +381,13 @@ restore_3630:
381 381
382restore: 382restore:
383 /* 383 /*
384 * Check what was the reason for mpu reset and store the reason in r9: 384 * Read the pwstctrl register to check the reason for mpu reset.
385 * 0 - No context lost 385 * This tells us what was lost.
386 * 1 - Only L1 and logic lost
387 * 2 - Only L2 lost - In this case, we wont be here
388 * 3 - Both L1 and L2 lost
389 */ 386 */
390 ldr r1, pm_pwstctrl_mpu 387 ldr r1, pm_pwstctrl_mpu
391 ldr r2, [r1] 388 ldr r2, [r1]
392 and r2, r2, #0x3 389 and r2, r2, #0x3
393 cmp r2, #0x0 @ Check if target power state was OFF or RET 390 cmp r2, #0x0 @ Check if target power state was OFF or RET
394 moveq r9, #0x3 @ MPU OFF => L1 and L2 lost
395 movne r9, #0x1 @ Only L1 and L2 lost => avoid L2 invalidation
396 bne logic_l1_restore 391 bne logic_l1_restore
397 392
398 ldr r0, l2dis_3630 393 ldr r0, l2dis_3630