imported Freescale specific U-Boot additions for i.MX28,... release L2.6.31_10.08.01

[karo-tx-uboot.git] / board / voiceblue / setup.S

diff --git a/board/voiceblue/setup.S b/board/voiceblue/setup.S
index dcf37b5dce5bc9390f60e823162b691dfa93dcd9..cc50e8c395c3e83ceb6670013d0a97b9c8e2c5fa 100755 (executable)
--- a/board/voiceblue/setup.S
+++ b/board/voiceblue/setup.S
@@ -77,7 +77,7 @@ MUX_CONFIG_VALUES:
        .word 0x00000000        @ FUNC_MUX_CTRL_3
        .word 0x00000000        @ FUNC_MUX_CTRL_4
        .word 0x12082480        @ FUNC_MUX_CTRL_5
-       .word 0x00000004        @ FUNC_MUX_CTRL_6
+       .word 0x0000001c        @ FUNC_MUX_CTRL_6
        .word 0x00000003        @ FUNC_MUX_CTRL_7
        .word 0x10001200        @ FUNC_MUX_CTRL_8
        .word 0x01201012        @ FUNC_MUX_CTRL_9
@@ -273,7 +273,7 @@ ulocking:
        mov     r0, #0x4000
 sdelay:
        subs    r0, r0, #0x1
-       bne     sdelay
+       bne     sdelay
 
        /* back to arch calling code */
        mov     pc, lr