X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=arch%2Farm%2Fcpu%2Farm926ejs%2Fmxs%2Fspl_mem_init.c;h=bd72f36e2132911bc7ff6544c8f1279853f1e322;hb=ef10f5faa7a37f6a7936ba840c4a308c924baff4;hp=3427616fbeb0959ca3b8255682fa0ff2add38bfb;hpb=964da15a997e0d1208b491d11d172281fb7ed2bc;p=karo-tx-uboot.git diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c index 3427616fbe..bd72f36e21 100644 --- 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! */ - early_delay(10000); + udelay(10000); 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; - early_delay(1000); + udelay(1000); } /* 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); @@ -341,7 +341,7 @@ static void mx28_mem_init(void) void mxs_mem_init(void) { - early_delay(11000); + udelay(11000); mxs_mem_init_clock();