ENGR00312939 ARM:imx6x: Ensure that the suspend/resume code saves the registers.

The suspend/resume code needs to save the ARM registers that is used
in the code. The return paths from the suspend code can be different, based
on if an interrupt is pending. So we cannot depend on the kernel code to
restore the registers.

Signed-off-by: Ranjani Vaidyanathan <Ranjani.Vaidyanathan@freescale.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/arm/mach-imx/suspend-imx6.S b/arch/arm/mach-imx/suspend-imx6.S
index 261a29080c30..f21e1359bc5c 100644
--- a/arch/arm/mach-imx/suspend-imx6.S
+++ b/arch/arm/mach-imx/suspend-imx6.S
@@ -558,6 +558,8 @@
 
 ENTRY(imx6_suspend)
 
+        push {r4-r12}
+
         /*
          * counting the resume address in iram
          * to set it in SRC register.
@@ -873,6 +875,8 @@ poll_dvfs_clear_2:
         ldr     r6, =0x0
         mcr     p15, 0, r6, c8, c3, 0
 
+        pop {r4-r12}
+
         /* return to suspend finish */
         mov     pc, lr