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

Commit 9b5f7428 authored by Jeremy Vial's avatar Jeremy Vial Committed by Tony Lindgren
Browse files

ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX rev3.1.2 case. 



According to the comment “restore_es3: applies to 34xx >= ES3.0" in
"arch/arm/mach-omap2/sleep34xx.S”, omap3_restore_es3 should be used
if the revision of an OMAP34xx is ES3.1.2.

Signed-off-by: default avatarJeremy Vial <jvial@adeneo-embedded.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d40dbcd5

arch/arm/mach-omap2/control.c

+2 −1
Original line number Diff line number Diff line
@@ -309,7 +309,8 @@ void omap3_save_scratchpad_contents(void) 
		scratchpad_contents.public_restore_ptr =

			virt_to_phys(omap3_restore_3630);

	else if (omap_rev() != OMAP3430_REV_ES3_0 &&

					omap_rev() != OMAP3430_REV_ES3_1)

					omap_rev() != OMAP3430_REV_ES3_1 &&

					omap_rev() != OMAP3430_REV_ES3_1_2)

		scratchpad_contents.public_restore_ptr =

			virt_to_phys(omap3_restore);

	else