Skip to content

Commit

Permalink
ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX rev3.…
Browse files Browse the repository at this point in the history
…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: Jeremy Vial <jvial@adeneo-embedded.com>
Cc: stable@vger.kernel.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Jeremy Vial authored and Tony Lindgren committed Aug 1, 2014
1 parent d40dbcd commit 9b5f742
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/mach-omap2/control.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9b5f742

Please sign in to comment.