diff options
| author | Tom Rini <trini@ti.com> | 2014-10-10 20:59:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-10-10 20:59:28 -0400 |
| commit | e89d623f099c44b0b166ccf46bce2e6a0b99c984 (patch) | |
| tree | da7fb5d7260b477a976519e580264ba1f86a866b /arch/arm/cpu/arm926ejs/mxs | |
| parent | ed8271d11c5c7a31eb49f787fa25eece6b82bb9e (diff) | |
| parent | 3d420cbd355a5f09e4f113eb10579a264a8ef138 (diff) | |
| download | u-boot-imx-e89d623f099c44b0b166ccf46bce2e6a0b99c984.zip u-boot-imx-e89d623f099c44b0b166ccf46bce2e6a0b99c984.tar.gz u-boot-imx-e89d623f099c44b0b166ccf46bce2e6a0b99c984.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'arch/arm/cpu/arm926ejs/mxs')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c index 3baf4dd..97ef67d 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_mem_init.c @@ -240,9 +240,14 @@ static void mx23_mem_setup_vddmem(void) struct mxs_power_regs *power_regs = (struct mxs_power_regs *)MXS_POWER_BASE; + /* We must wait before and after disabling the current limiter! */ + early_delay(10000); + clrbits_le32(&power_regs->hw_power_vddmemctrl, POWER_VDDMEMCTRL_ENABLE_ILIMIT); + early_delay(10000); + } static void mx23_mem_init(void) @@ -269,7 +274,13 @@ static void mx23_mem_init(void) setbits_le32(MXS_DRAM_BASE + 0x20, 1 << 16); clrbits_le32(MXS_DRAM_BASE + 0x40, 1 << 17); - early_delay(20000); + + /* Wait for EMI_STAT bit DRAM_HALTED */ + for (;;) { + if (!(readl(MXS_EMI_BASE + 0x10) & (1 << 1))) + break; + early_delay(1000); + } /* Adjust EMI port priority. */ clrsetbits_le32(0x80020000, 0x1f << 16, 0x2); |