ARM: uniphier: replace <linux/err.h> with <linux/errno.h>

[u-boot.git] / arch / arm / mach-uniphier / dram / umc-pro4.c

diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index f6c2d7f145f31095f8781919fce2922a729954a4..740247a8d852509eccbe9366ac49e722fe9d4121 100644 (file)
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@@ -7,13 +7,13 @@
  */
 
 #include <common.h>
-#include <linux/err.h>
+#include <linux/errno.h>
 #include <linux/io.h>
 #include <linux/sizes.h>
 #include <asm/processor.h>
 
 #include "../init.h"
-#include "ddrphy-regs.h"
+#include "ddrphy-init.h"
 #include "umc-regs.h"
 
 #define DRAM_CH_NR     2
@@ -137,7 +137,7 @@ static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
        int phy, 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();
 
        for (phy = 0; phy < nr_phy; phy++) {