Merge branch 'master' of /home/wd/git/u-boot/custodians

[oweals/u-boot.git] / board / voiceblue / setup.S

diff --git a/board/voiceblue/setup.S b/board/voiceblue/setup.S
index 4a110e846dc084491f6786f80ee8a55ab14d161e..cc50e8c395c3e83ceb6670013d0a97b9c8e2c5fa 100644 (file)
--- 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
@@ -122,8 +122,8 @@ MUX_CONFIG_OFFSETS:
        .byte 0x0c              @ COMP_MODE_CTRL_0
        .byte 0xff
 
-.globl platformsetup
-platformsetup:
+.globl lowlevel_init
+lowlevel_init:
        /* Improve performance a bit... */
        mrc     p15, 0, r1, c0, c0, 0           @ read C15 ID register
        mrc     p15, 0, r1, c0, c0, 1           @ read C15 Cache information register
@@ -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