mxs: spl: replace bogus early_delay() function with standard udelay() calls

[karo-tx-uboot.git] / arch / arm / cpu / arm926ejs / mxs / spl_mem_init.c

diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
index 3427616fbeb0959ca3b8255682fa0ff2add38bfb..bd72f36e2132911bc7ff6544c8f1279853f1e322 100644 (file)
--- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
+++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c
@@ -254,12 +254,12 @@ static void mx23_mem_setup_vddmem(void)
        debug("SPL: Setting mx23 VDDMEM\n");
 
        /* We must wait before and after disabling the current limiter! */
        debug("SPL: Setting mx23 VDDMEM\n");
 
        /* We must wait before and after disabling the current limiter! */

-       early_delay(10000);
+       udelay(10000);

 
        clrbits_le32(&power_regs->hw_power_vddmemctrl,
                POWER_VDDMEMCTRL_ENABLE_ILIMIT);
 
 
        clrbits_le32(&power_regs->hw_power_vddmemctrl,
                POWER_VDDMEMCTRL_ENABLE_ILIMIT);
 

-       early_delay(10000);
+       udelay(10000);

 
 }
 
 
 }
 


@@ -294,12 +294,12 @@ static void mx23_mem_init(void)
        for (;;) {
                if (!(readl(MXS_EMI_BASE + 0x10) & (1 << 1)))
                        break;
        for (;;) {
                if (!(readl(MXS_EMI_BASE + 0x10) & (1 << 1)))
                        break;

-               early_delay(1000);
+               udelay(1000);

        }
 
        /* Adjust EMI port priority. */
        clrsetbits_le32(0x80020000, 0x1f << 16, 0x2);
        }
 
        /* Adjust EMI port priority. */
        clrsetbits_le32(0x80020000, 0x1f << 16, 0x2);

-       early_delay(20000);
+       udelay(20000);

 
        setbits_le32(MXS_DRAM_BASE + 0x40, 1 << 19);
        setbits_le32(MXS_DRAM_BASE + 0x40, 1 << 11);
 
        setbits_le32(MXS_DRAM_BASE + 0x40, 1 << 19);
        setbits_le32(MXS_DRAM_BASE + 0x40, 1 << 11);


@@ -341,7 +341,7 @@ static void mx28_mem_init(void)
 
 void mxs_mem_init(void)
 {
 
 void mxs_mem_init(void)
 {

-       early_delay(11000);
+       udelay(11000);

 
        mxs_mem_init_clock();
 
 
        mxs_mem_init_clock();