From 2baa5aac618927f85fcd61fcf8acaa8530e3f84f Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 22 Jun 2011 12:54:41 +0100 Subject: [PATCH] --- yaml --- r: 258251 b: refs/heads/master c: 2637ce30e145557bf89ebcf35b2d78e729e16e5a h: refs/heads/master i: 258249: 1723746bf07c7dad174603c5579ed3d91cab43c2 258247: 1fea0d0b14345f068027a42ed962912d0b33372e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/sleep34xx.S | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 65966204a927..e7ad614ee242 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 857c1b81f8dd2e2a97d859d7e53dd955e2ab55af +refs/heads/master: 2637ce30e145557bf89ebcf35b2d78e729e16e5a diff --git a/trunk/arch/arm/mach-omap2/sleep34xx.S b/trunk/arch/arm/mach-omap2/sleep34xx.S index 9551c7dc71ef..12e9da2f0263 100644 --- a/trunk/arch/arm/mach-omap2/sleep34xx.S +++ b/trunk/arch/arm/mach-omap2/sleep34xx.S @@ -381,18 +381,13 @@ restore_3630: restore: /* - * Check what was the reason for mpu reset and store the reason in r9: - * 0 - No context lost - * 1 - Only L1 and logic lost - * 2 - Only L2 lost - In this case, we wont be here - * 3 - Both L1 and L2 lost + * Read the pwstctrl register to check the reason for mpu reset. + * This tells us what was lost. */ ldr r1, pm_pwstctrl_mpu ldr r2, [r1] and r2, r2, #0x3 cmp r2, #0x0 @ Check if target power state was OFF or RET - moveq r9, #0x3 @ MPU OFF => L1 and L2 lost - movne r9, #0x1 @ Only L1 and L2 lost => avoid L2 invalidation bne logic_l1_restore ldr r0, l2dis_3630