Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2637ce30 authored by Russell King's avatar Russell King
Browse files

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: default avatarKevin Hilman <khilman@ti.com>
Tested-by: default avatarKevin Hilman <khilman@ti.com>
Acked-by: default avatarJean Pihet <j-pihet@ti.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 857c1b81

arch/arm/mach-omap2/sleep34xx.S

+2 −7
Original line number Diff line number Diff line
@@ -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