ARM: uniphier: rework DRAM size handling in UMC init code
[oweals/u-boot.git] / arch / arm / mach-uniphier / dram / umc-ph1-ld4.c
index ffd7aa97b28fe5fcdbcc51c931ffef0b2eacb667..0eb47d73d7a39d35bb82af02bc2e72e6650695cd 100644 (file)
 #include "ddrphy-regs.h"
 #include "umc-regs.h"
 
+#define DRAM_CH_NR     2
+
+enum dram_freq {
+       DRAM_FREQ_1333M,
+       DRAM_FREQ_1600M,
+       DRAM_FREQ_NR,
+};
+
+enum dram_size {
+       DRAM_SZ_128M,
+       DRAM_SZ_256M,
+       DRAM_SZ_NR,
+};
+
+static u32 umc_cmdctla_plus[DRAM_FREQ_NR] = {0x45990b11, 0x36bb0f17};
+static u32 umc_cmdctlb_plus[DRAM_FREQ_NR] = {0x16958924, 0x18c6aa24};
+static u32 umc_spcctla[DRAM_FREQ_NR][DRAM_SZ_NR] = {
+       {0x00240512, 0x00350512},
+       {0x002b0617, 0x003f0617},
+};
+static u32 umc_spcctlb[DRAM_FREQ_NR] = {0x00ff0006, 0x00ff0008};
+static u32 umc_rdatactl[DRAM_FREQ_NR] = {0x000a00ac, 0x000c00ae};
+
+static int umc_get_rank(int ch)
+{
+       return ch;      /* ch0: rank0, ch1: rank1 for this SoC */
+}
+
 static void umc_start_ssif(void __iomem *ssif_base)
 {
        writel(0x00000000, ssif_base + 0x0000b004);
@@ -47,62 +75,48 @@ static void umc_start_ssif(void __iomem *ssif_base)
        writel(0x00000001, ssif_base + UMC_DMDRST);
 }
 
-static void umc_dramcont_init(void __iomem *dramcont, void __iomem *ca_base,
-                             int size, int freq)
+static int umc_dramcont_init(void __iomem *dramcont, void __iomem *ca_base,
+                            int freq, unsigned long size, bool ddr3plus)
 {
-       if (freq == 1333) {
-               writel(0x45990b11, dramcont + UMC_CMDCTLA);
-               writel(0x16958924, dramcont + UMC_CMDCTLB);
-               writel(0x5101046A, dramcont + UMC_INITCTLA);
-
-               if (size == 1)
-                       writel(0x27028B0A, dramcont + UMC_INITCTLB);
-               else if (size == 2)
-                       writel(0x38028B0A, dramcont + UMC_INITCTLB);
-
-               writel(0x000FF0FF, dramcont + UMC_INITCTLC);
-               writel(0x00000b51, dramcont + UMC_DRMMR0);
-       } else if (freq == 1600) {
-               writel(0x36BB0F17, dramcont + UMC_CMDCTLA);
-               writel(0x18C6AA24, dramcont + UMC_CMDCTLB);
-               writel(0x5101387F, dramcont + UMC_INITCTLA);
-
-               if (size == 1)
-                       writel(0x2F030D3F, dramcont + UMC_INITCTLB);
-               else if (size == 2)
-                       writel(0x43030D3F, dramcont + UMC_INITCTLB);
-
-               writel(0x00FF00FF, dramcont + UMC_INITCTLC);
-               writel(0x00000d71, dramcont + UMC_DRMMR0);
-       }
-
-       writel(0x00000006, dramcont + UMC_DRMMR1);
-
-       if (freq == 1333)
-               writel(0x00000290, dramcont + UMC_DRMMR2);
-       else if (freq == 1600)
-               writel(0x00000298, dramcont + UMC_DRMMR2);
-
-       writel(0x00000800, dramcont + UMC_DRMMR3);
+       enum dram_freq freq_e;
+       enum dram_size size_e;
 
-       if (freq == 1333) {
-               if (size == 1)
-                       writel(0x00240512, dramcont + UMC_SPCCTLA);
-               else if (size == 2)
-                       writel(0x00350512, dramcont + UMC_SPCCTLA);
+       if (!ddr3plus) {
+               pr_err("DDR3 standard is not supported\n");
+               return -EINVAL;
+       }
 
-               writel(0x00ff0006, dramcont + UMC_SPCCTLB);
-               writel(0x000a00ac, dramcont + UMC_RDATACTL_D0);
-       } else if (freq == 1600) {
-               if (size == 1)
-                       writel(0x002B0617, dramcont + UMC_SPCCTLA);
-               else if (size == 2)
-                       writel(0x003F0617, dramcont + UMC_SPCCTLA);
+       switch (freq) {
+       case 1333:
+               freq_e = DRAM_FREQ_1333M;
+               break;
+       case 1600:
+               freq_e = DRAM_FREQ_1600M;
+               break;
+       default:
+               pr_err("unsupported DRAM frequency %d MHz\n", freq);
+               return -EINVAL;
+       }
 
-               writel(0x00ff0008, dramcont + UMC_SPCCTLB);
-               writel(0x000c00ae, dramcont + UMC_RDATACTL_D0);
+       switch (size) {
+       case 0:
+               return 0;
+       case SZ_128M:
+               size_e = DRAM_SZ_128M;
+               break;
+       case SZ_256M:
+               size_e = DRAM_SZ_256M;
+               break;
+       default:
+               pr_err("unsupported DRAM size 0x%08lx\n", size);
+               return -EINVAL;
        }
 
+       writel(umc_cmdctla_plus[freq_e], dramcont + UMC_CMDCTLA);
+       writel(umc_cmdctlb_plus[freq_e], dramcont + UMC_CMDCTLB);
+       writel(umc_spcctla[freq_e][size_e], dramcont + UMC_SPCCTLA);
+       writel(umc_spcctlb[freq_e], dramcont + UMC_SPCCTLB);
+       writel(umc_rdatactl[freq_e], dramcont + UMC_RDATACTL_D0);
        writel(0x04060806, dramcont + UMC_WDATACTL_D0);
        writel(0x04a02000, dramcont + UMC_DATASET);
        writel(0x00000000, ca_base + 0x2300);
@@ -121,56 +135,55 @@ static void umc_dramcont_init(void __iomem *dramcont, void __iomem *ca_base,
        writel(0x200a0a00, dramcont + UMC_SPCSETB);
        writel(0x00000000, dramcont + UMC_SPCSETD);
        writel(0x00000520, dramcont + UMC_DFICUPDCTLA);
+
+       return 0;
 }
 
-static int umc_init_sub(int freq, int size_ch0, int size_ch1)
+static int umc_ch_init(void __iomem *dc_base, void __iomem *ca_base,
+                      int freq, unsigned long size, bool ddr3plus, int ch)
 {
-       void __iomem *ssif_base = (void __iomem *)UMC_SSIF_BASE;
-       void __iomem *ca_base0 = (void __iomem *)UMC_CA_BASE(0);
-       void __iomem *ca_base1 = (void __iomem *)UMC_CA_BASE(1);
-       void __iomem *dramcont0 = (void __iomem *)UMC_DRAMCONT_BASE(0);
-       void __iomem *dramcont1 = (void __iomem *)UMC_DRAMCONT_BASE(1);
-       void __iomem *phy0_0 = (void __iomem *)DDRPHY_BASE(0, 0);
-       void __iomem *phy1_0 = (void __iomem *)DDRPHY_BASE(1, 0);
-
-       umc_dram_init_start(dramcont0);
-       umc_dram_init_start(dramcont1);
-       umc_dram_init_poll(dramcont0);
-       umc_dram_init_poll(dramcont1);
-
-       writel(0x00000101, dramcont0 + UMC_DIOCTLA);
-
-       ph1_ld4_ddrphy_init(phy0_0, freq, size_ch0);
+       void __iomem *phy_base = dc_base + 0x00001000;
+       int ret;
 
-       ddrphy_prepare_training(phy0_0, 0);
-       ddrphy_training(phy0_0);
+       umc_dram_init_start(dc_base);
+       umc_dram_init_poll(dc_base);
 
-       writel(0x00000101, dramcont1 + UMC_DIOCTLA);
+       writel(0x00000101, dc_base + UMC_DIOCTLA);
 
-       ph1_ld4_ddrphy_init(phy1_0, freq, size_ch1);
+       ret = ph1_ld4_ddrphy_init(phy_base, freq, ddr3plus);
+       if (ret)
+               return ret;
 
-       ddrphy_prepare_training(phy1_0, 1);
-       ddrphy_training(phy1_0);
-
-       umc_dramcont_init(dramcont0, ca_base0, size_ch0, freq);
-       umc_dramcont_init(dramcont1, ca_base1, size_ch1, freq);
-
-       umc_start_ssif(ssif_base);
+       ddrphy_prepare_training(phy_base, umc_get_rank(ch));
+       ret = ddrphy_training(phy_base);
+       if (ret)
+               return ret;
 
-       return 0;
+       return umc_dramcont_init(dc_base, ca_base, freq, size, ddr3plus);
 }
 
 int ph1_ld4_umc_init(const struct uniphier_board_data *bd)
 {
-       if ((bd->dram_ch0_size == SZ_128M || bd->dram_ch0_size == SZ_256M) &&
-           (bd->dram_ch1_size == SZ_128M || bd->dram_ch1_size == SZ_256M) &&
-           (bd->dram_freq == 1333 || bd->dram_freq == 1600) &&
-           bd->dram_ch0_width == 16 && bd->dram_ch1_width == 16) {
-               return umc_init_sub(bd->dram_freq,
-                                   bd->dram_ch0_size / SZ_128M,
-                                   bd->dram_ch1_size / SZ_128M);
-       } else {
-               pr_err("Unsupported DDR configuration\n");
-               return -EINVAL;
+       void __iomem *umc_base = (void __iomem *)0x5b800000;
+       void __iomem *ca_base = umc_base + 0x00001000;
+       void __iomem *dc_base = umc_base + 0x00400000;
+       void __iomem *ssif_base = umc_base;
+       int ch, ret;
+
+       for (ch = 0; ch < DRAM_CH_NR; ch++) {
+               ret = umc_ch_init(dc_base, ca_base, bd->dram_freq,
+                                 bd->dram_ch[ch].size,
+                                 bd->dram_ddr3plus, ch);
+               if (ret) {
+                       pr_err("failed to initialize UMC ch%d\n", ch);
+                       return ret;
+               }
+
+               ca_base += 0x00001000;
+               dc_base += 0x00200000;
        }
+
+       umc_start_ssif(ssif_base);
+
+       return 0;
 }