---

yaml
---
r: 258251
b: refs/heads/master
c: 2637ce3
h: refs/heads/master
i:
  258249: 1723746
  258247: 1fea0d0
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 857c1b81f8dd2e2a97d859d7e53dd955e2ab55af
+refs/heads/master: 2637ce30e145557bf89ebcf35b2d78e729e16e5a

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