diff options
Diffstat (limited to 'arch/arm/mach-omap2/sram243x.S')
-rw-r--r-- | arch/arm/mach-omap2/sram243x.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/sram243x.S b/arch/arm/mach-omap2/sram243x.S index a1e9edd673f4..d5deb9761fc7 100644 --- a/arch/arm/mach-omap2/sram243x.S +++ b/arch/arm/mach-omap2/sram243x.S | |||
@@ -101,7 +101,7 @@ i_dll_wait: | |||
101 | i_dll_delay: | 101 | i_dll_delay: |
102 | subs r4, r4, #0x1 | 102 | subs r4, r4, #0x1 |
103 | bne i_dll_delay | 103 | bne i_dll_delay |
104 | mov pc, lr | 104 | ret lr |
105 | 105 | ||
106 | /* | 106 | /* |
107 | * shift up or down voltage, use R9 as input to tell level. | 107 | * shift up or down voltage, use R9 as input to tell level. |
@@ -125,7 +125,7 @@ volt_delay: | |||
125 | ldr r7, [r3] @ get timer value | 125 | ldr r7, [r3] @ get timer value |
126 | cmp r5, r7 @ time up? | 126 | cmp r5, r7 @ time up? |
127 | bhi volt_delay @ not yet->branch | 127 | bhi volt_delay @ not yet->branch |
128 | mov pc, lr @ back to caller. | 128 | ret lr @ back to caller. |
129 | 129 | ||
130 | omap243x_sdi_cm_clksel2_pll: | 130 | omap243x_sdi_cm_clksel2_pll: |
131 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKSEL2) | 131 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKSEL2) |
@@ -220,7 +220,7 @@ volt_delay_c: | |||
220 | ldr r7, [r10] @ get timer value | 220 | ldr r7, [r10] @ get timer value |
221 | cmp r8, r7 @ time up? | 221 | cmp r8, r7 @ time up? |
222 | bhi volt_delay_c @ not yet->branch | 222 | bhi volt_delay_c @ not yet->branch |
223 | mov pc, lr @ back to caller | 223 | ret lr @ back to caller |
224 | 224 | ||
225 | omap243x_srs_cm_clksel2_pll: | 225 | omap243x_srs_cm_clksel2_pll: |
226 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKSEL2) | 226 | .word OMAP2430_CM_REGADDR(PLL_MOD, CM_CLKSEL2) |