mmc: rescan fails on empty slot

[u-boot] / board / incaip / lowlevel_init.S

diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S
index fb64ef419dee4a5a0d89ae879b1fb4f15cf0516e..b76579568627df1d83929da47d6528ca569d161d 100644 (file)
--- a/board/incaip/lowlevel_init.S
+++ b/board/incaip/lowlevel_init.S
@@ -23,7 +23,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/regdef.h>
 
 
@@ -66,6 +65,7 @@
        .globl  ebu_init
        .ent    ebu_init
 ebu_init:
+__ebu_init:
 
        li      t1, EBU_MODUL_BASE
        li      t2, 0xA0000041
@@ -104,7 +104,7 @@ ebu_init:
        li      t2, 0x684143FD
        sw      t2, EBU_BUSCON1(t1)
 3:
-       j       ra
+       jr      ra
        nop
 
        .end    ebu_init
@@ -118,6 +118,7 @@ ebu_init:
        .globl  cgu_init
        .ent    cgu_init
 cgu_init:
+__cgu_init:
 
        li      t1, CGU_MODUL_BASE
 
@@ -168,7 +169,7 @@ cgu_init:
        li      t2, 0x80000001
        sw      t2, CGU_MUXCR(t1)
 5:
-       j       ra
+       jr      ra
        nop
 
        .end    cgu_init
@@ -182,6 +183,7 @@ cgu_init:
        .globl  sdram_init
        .ent    sdram_init
 sdram_init:
+__sdram_init:
 
        li      t1, MC_MODUL_BASE
 
@@ -263,7 +265,7 @@ sdram_init:
        li      t2, 0x00000001
        sw      t2, MC_CTRLENA(t1)
 
-       j       ra
+       jr      ra
        nop
 
        .end    sdram_init
@@ -273,23 +275,29 @@ sdram_init:
        .ent    lowlevel_init
 lowlevel_init:
 
+       /* Disable Watchdog.
+        */
+       la      t9, disable_incaip_wdt
+       jalr    t9
+       nop
+
        /* EBU, CGU and SDRAM Initialization.
         */
-       li      a0, CPU_CLOCK_RATE
+       li      a0, CONFIG_CPU_CLOCK_RATE
        move    t0, ra
 
        /* We rely on the fact that neither ebu_init() nor cgu_init() nor sdram_init()
         * modify t0 and a0.
         */
-       bal     cgu_init
+       bal     __cgu_init
        nop
-       bal     ebu_init
+       bal     __ebu_init
        nop
-       bal     sdram_init
+       bal     __sdram_init
        nop
        move    ra, t0
 
-       j       ra
+       jr      ra
        nop
 
        .end    lowlevel_init