diff options
| author | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-11-05 15:53:44 (GMT) |
|---|---|---|
| committer | Matthew Weigel <Matthew.Weigel@freescale.com> | 2014-12-11 18:40:20 (GMT) |
| commit | cc3516a4dfcf877e98c06183ea4cdc1408cdc6c8 (patch) | |
| tree | 24aecac13e83ea5f5883af49b68fa377b25e80ee /arch/arm/mach-imx | |
| parent | 9aec854dba9600dcc66c3f594744fb2d842a5bc0 (diff) | |
| parent | 400d3d4ab76cb652e5a65425fceb591a21ff95aa (diff) | |
| download | linux-fsl-qoriq-cc3516a4dfcf877e98c06183ea4cdc1408cdc6c8.tar.xz | |
Merge remote-tracking branch 'ls1/LS1-SDK'
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/sleep-ls1.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/sleep-ls1.S b/arch/arm/mach-imx/sleep-ls1.S index ae0a8af..b8d7f1a 100644 --- a/arch/arm/mach-imx/sleep-ls1.S +++ b/arch/arm/mach-imx/sleep-ls1.S @@ -59,6 +59,7 @@ ENTRY(ls1_do_deepsleep) isb /* jump to sram code using physical address */ + THUMB( orr r0, r0, #1 ) bx r0 ENDPROC(ls1_do_deepsleep) .popsection @@ -123,6 +124,7 @@ ENTRY(ls1_sram_code_size) .word . - ls1_start_fsm /* the bootloader will jump to here after wakeup from deep sleep */ + .arm .align L1_CACHE_SHIFT ENTRY(ls1_deepsleep_resume) THUMB( adr r6, BSYM(1f) ) |