diff options
| author | Jeremy Vial <jvial@adeneo-embedded.com> | 2014-07-31 15:10:33 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-09-13 23:41:42 +0100 |
| commit | 8977e721d5fe7c6d4ce734cd5039b80c2d6f71a3 (patch) | |
| tree | b62bff8db7a31b8c4fe77b16cee9ca26346600ff /arch/arm/mach-omap2 | |
| parent | 24a26ff9e1bd26f50617b0bac745141dbc226e45 (diff) | |
| download | kernel_samsung_smdk4412-8977e721d5fe7c6d4ce734cd5039b80c2d6f71a3.zip kernel_samsung_smdk4412-8977e721d5fe7c6d4ce734cd5039b80c2d6f71a3.tar.gz kernel_samsung_smdk4412-8977e721d5fe7c6d4ce734cd5039b80c2d6f71a3.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2')
| -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 e34d27f..724f823 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c @@ -282,7 +282,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 |