diff options
| author | Jeremy Vial <jvial@adeneo-embedded.com> | 2014-07-31 15:10:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-05 16:28:34 -0700 |
| commit | 324b23e38db599cd1eb610fb92b0142d5c0be4a8 (patch) | |
| tree | ddec95adb564f2e983204abe209a60560a710117 /arch | |
| parent | 2cffa7238a408b7ff5ce9a4352485ff035fb7b19 (diff) | |
| download | linux-3.10-324b23e38db599cd1eb610fb92b0142d5c0be4a8.tar.gz linux-3.10-324b23e38db599cd1eb610fb92b0142d5c0be4a8.tar.bz2 linux-3.10-324b23e38db599cd1eb610fb92b0142d5c0be4a8.zip | |
ARM: OMAP3: Fix choice of omap3_restore_es function in OMAP34XX rev3.1.2 case.
commit 9b5f7428f8b16bd8980213f2b70baf1dd0b9e36c upstream.
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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/control.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index 2adb2683f07..6124da1a07d 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c @@ -323,7 +323,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 |