Due to check for absolute omap_rev() values against ES3.0 and ES3.1, the restore pointer for OMAP3630 is incorrectly assigned. The problem may be observed with OMAP3430 ES3.1.1 as well. Submitting this as RFC because I have only compiled with changes. Haven't yet tried on EVM. Will submit formal patch after testing. Signed-off-by: Sanjeev Premi <premi@xxxxxx> --- arch/arm/mach-omap2/control.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c index 43f8a33..575593b 100644 --- a/arch/arm/mach-omap2/control.c +++ b/arch/arm/mach-omap2/control.c @@ -213,13 +213,16 @@ void omap3_save_scratchpad_contents(void) /* Populate the Scratchpad contents */ scratchpad_contents.boot_config_ptr = 0x0; - if (omap_rev() != OMAP3430_REV_ES3_0 && - omap_rev() != OMAP3430_REV_ES3_1) + + if (!cpu_is_omap3630() && + (cpu_is_34xx() && + (omap_rev() < OMAP3430_REV_ES3_0))) scratchpad_contents.public_restore_ptr = virt_to_phys(get_restore_pointer()); else scratchpad_contents.public_restore_ptr = virt_to_phys(get_es3_restore_pointer()); + if (omap_type() == OMAP2_DEVICE_TYPE_GP) scratchpad_contents.secure_ram_restore_ptr = 0x0; else -- 1.6.6.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
