sunxi: H616: DRAM: Adjust configuration procedure

When comparing configuration procedure to vendor driver, I noticed that
one command was out of order and that some delays were missing.

Fix that.

Signed-off-by: Jernej Skrabec <jernej.skrabec@gmail.com>
Tested-by: Chris Morgan <macromorgan@hotmail.com>

diff --git a/arch/arm/mach-sunxi/dram_sun50i_h616.c b/arch/arm/mach-sunxi/dram_sun50i_h616.c
index 52f779917346f2de8d8bccb54cca58f088b62f4e..35405915e9ab850a7c5e2a37d0c12de3806c30ee 100644 (file)
--- a/arch/arm/mach-sunxi/dram_sun50i_h616.c
+++ b/arch/arm/mach-sunxi/dram_sun50i_h616.c
@@ -1014,12 +1014,16 @@ static bool mctl_phy_init(const struct dram_para *para,
                clrsetbits_le32(SUNXI_DRAM_PHY0_BASE + 0x14c, 0xe0, 0x20);
        }
 
+       clrbits_le32(&mctl_com->unk_0x500, 0x200);
+       udelay(1);
+
        clrbits_le32(SUNXI_DRAM_PHY0_BASE + 0x14c, 8);
 
        mctl_await_completion((u32 *)(SUNXI_DRAM_PHY0_BASE + 0x180), 4, 4);
 
+       udelay(1000);
+
        writel(0x37, SUNXI_DRAM_PHY0_BASE + 0x58);
-       clrbits_le32(&mctl_com->unk_0x500, 0x200);
 
        writel(0, &mctl_ctl->swctl);
        setbits_le32(&mctl_ctl->dfimisc, 1);
@@ -1038,6 +1042,8 @@ static bool mctl_phy_init(const struct dram_para *para,
        mctl_await_completion(&mctl_ctl->swstat, 1, 1);
        mctl_await_completion(&mctl_ctl->statr, 3, 1);
 
+       udelay(200);
+
        writel(0, &mctl_ctl->swctl);
        clrbits_le32(&mctl_ctl->dfimisc, 1);
 
@@ -1281,8 +1287,10 @@ static bool mctl_ctrl_init(const struct dram_para *para,
        setbits_le32(&mctl_ctl->clken, BIT(8));
 
        clrsetbits_le32(&mctl_com->unk_0x500, BIT(24), 0x300);
+       udelay(1);
        /* this write seems to enable PHY MMIO region */
        setbits_le32(&mctl_com->unk_0x500, BIT(24));
+       udelay(1);
 
        if (!mctl_phy_init(para, config))
                return false;