diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-29 17:15:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-29 17:15:24 -0400 |
| commit | 9f375f655fa54f88fdbe35d3f0c3bd6c1a91671b (patch) | |
| tree | 4882d126727475838107873a5c02c39ff419ecd8 /arch/arm/mach-uniphier/dram/umc-ld4.c | |
| parent | 4d6afd69babafbf6580cb04dacd9479df03a5de0 (diff) | |
| parent | 6eeb624148c1aaedd1cf4f89286c7719bb140fd0 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/mach-uniphier/dram/umc-ld4.c')
| -rw-r--r-- | arch/arm/mach-uniphier/dram/umc-ld4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c index 1ea6193f88..90e7f2d271 100644 --- a/arch/arm/mach-uniphier/dram/umc-ld4.c +++ b/arch/arm/mach-uniphier/dram/umc-ld4.c @@ -13,7 +13,7 @@ #include <asm/processor.h> #include "../init.h" -#include "ddrphy-regs.h" +#include "ddrphy-init.h" #include "umc-regs.h" #define DRAM_CH_NR 2 @@ -149,7 +149,7 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base, int ret; writel(UMC_INITSET_INIT1EN, dc_base + UMC_INITSET); - while (readl(dc_base + UMC_INITSET) & UMC_INITSTAT_INIT1ST) + while (readl(dc_base + UMC_INITSTAT) & UMC_INITSTAT_INIT1ST) cpu_relax(); writel(0x00000101, dc_base + UMC_DIOCTLA); |