diff options
Diffstat (limited to 'arch/arm/mach-omap2/control.c')
-rw-r--r-- | arch/arm/mach-omap2/control.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index c41565ec16e3..2ff8d7cc60a2 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c | |||
@@ -209,8 +209,13 @@ void omap3_save_scratchpad_contents(void) | |||
209 | 209 | ||
210 | /* Populate the Scratchpad contents */ | 210 | /* Populate the Scratchpad contents */ |
211 | scratchpad_contents.boot_config_ptr = 0x0; | 211 | scratchpad_contents.boot_config_ptr = 0x0; |
212 | scratchpad_contents.public_restore_ptr = | 212 | if (omap_rev() != OMAP3430_REV_ES3_0 && |
213 | virt_to_phys(get_restore_pointer()); | 213 | omap_rev() != OMAP3430_REV_ES3_1) |
214 | scratchpad_contents.public_restore_ptr = | ||
215 | virt_to_phys(get_restore_pointer()); | ||
216 | else | ||
217 | scratchpad_contents.public_restore_ptr = | ||
218 | virt_to_phys(get_es3_restore_pointer()); | ||
214 | if (omap_type() == OMAP2_DEVICE_TYPE_GP) | 219 | if (omap_type() == OMAP2_DEVICE_TYPE_GP) |
215 | scratchpad_contents.secure_ram_restore_ptr = 0x0; | 220 | scratchpad_contents.secure_ram_restore_ptr = 0x0; |
216 | else | 221 | else |