diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/sram34xx.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/sram34xx.S b/arch/arm/mach-omap2/sram34xx.S index e6b112590d7d..82aa4a3d160c 100644 --- a/arch/arm/mach-omap2/sram34xx.S +++ b/arch/arm/mach-omap2/sram34xx.S | |||
| @@ -127,6 +127,8 @@ skip_cs1_params: | |||
| 127 | blne lock_dll | 127 | blne lock_dll |
| 128 | bl sdram_in_selfrefresh @ put SDRAM in self refresh, idle SDRC | 128 | bl sdram_in_selfrefresh @ put SDRAM in self refresh, idle SDRC |
| 129 | bl configure_core_dpll @ change the DPLL3 M2 divider | 129 | bl configure_core_dpll @ change the DPLL3 M2 divider |
| 130 | mov r12, r2 | ||
| 131 | bl wait_clk_stable @ wait for SDRC to stabilize | ||
| 130 | bl enable_sdrc @ take SDRC out of idle | 132 | bl enable_sdrc @ take SDRC out of idle |
| 131 | cmp r1, #SDRC_UNLOCK_DLL @ wait for DLL status to change | 133 | cmp r1, #SDRC_UNLOCK_DLL @ wait for DLL status to change |
| 132 | bleq wait_dll_unlock | 134 | bleq wait_dll_unlock |
| @@ -134,8 +136,6 @@ skip_cs1_params: | |||
| 134 | cmp r3, #1 @ if increasing SDRC clk rate, | 136 | cmp r3, #1 @ if increasing SDRC clk rate, |
| 135 | beq return_to_sdram @ return to SDRAM code, otherwise, | 137 | beq return_to_sdram @ return to SDRAM code, otherwise, |
| 136 | bl configure_sdrc @ reprogram SDRC regs now | 138 | bl configure_sdrc @ reprogram SDRC regs now |
| 137 | mov r12, r2 | ||
| 138 | bl wait_clk_stable @ wait for SDRC to stabilize | ||
| 139 | return_to_sdram: | 139 | return_to_sdram: |
| 140 | isb @ prevent speculative exec past here | 140 | isb @ prevent speculative exec past here |
| 141 | mov r0, #0 @ return value | 141 | mov r0, #0 @ return value |