ARM: uniphier: fix DRAM init poll address for LD4, Pro4, sLD8

The status register should be polled.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/mach-uniphier/dram/umc-ld4.c b/arch/arm/mach-uniphier/dram/umc-ld4.c
index 1ea6193f88ffabedc51b501583c936b81f097b43..82ab63c732d9b02c5d102aa92c9b77653773b295 100644 (file)
--- a/arch/arm/mach-uniphier/dram/umc-ld4.c
+++ b/arch/arm/mach-uniphier/dram/umc-ld4.c
@@ -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);

diff --git a/arch/arm/mach-uniphier/dram/umc-pro4.c b/arch/arm/mach-uniphier/dram/umc-pro4.c
index f6c2d7f145f31095f8781919fce2922a729954a4..4a7aa78b7e103a86b51e1d34b12478c783e0bb63 100644 (file)
--- a/arch/arm/mach-uniphier/dram/umc-pro4.c
+++ b/arch/arm/mach-uniphier/dram/umc-pro4.c
@@ -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++) {

diff --git a/arch/arm/mach-uniphier/dram/umc-sld8.c b/arch/arm/mach-uniphier/dram/umc-sld8.c
index 61b1dc1a3a24aac65f8414b58524ca81d24e8f52..568a007206c00880a927ad2b9b91ffc572cfc929 100644 (file)
--- a/arch/arm/mach-uniphier/dram/umc-sld8.c
+++ b/arch/arm/mach-uniphier/dram/umc-sld8.c
@@ -152,7 +152,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);