doc: update reference to README.imximage
[platform/kernel/u-boot.git] / board / freescale / vf610twr / vf610twr.c
index 4160acd..17427f2 100644 (file)
@@ -1,10 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
+#include <init.h>
 #include <asm/io.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/iomux-vf610.h>
@@ -12,7 +12,7 @@
 #include <asm/arch/crm_regs.h>
 #include <asm/arch/clock.h>
 #include <mmc.h>
-#include <fsl_esdhc.h>
+#include <fsl_esdhc_imx.h>
 #include <miiphy.h>
 #include <netdev.h>
 #include <i2c.h>
@@ -28,63 +28,117 @@ DECLARE_GLOBAL_DATA_PTR;
 #define ENET_PAD_CTRL  (PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_HIGH | \
                        PAD_CTL_DSE_50ohm | PAD_CTL_OBE_IBE_ENABLE)
 
+static struct ddrmc_cr_setting vf610twr_cr_settings[] = {
+       /* levelling */
+       { DDRMC_CR97_WRLVL_EN, 97 },
+       { DDRMC_CR98_WRLVL_DL_0(0), 98 },
+       { DDRMC_CR99_WRLVL_DL_1(0), 99 },
+       { DDRMC_CR102_RDLVL_REG_EN | DDRMC_CR102_RDLVL_GT_REGEN, 102 },
+       { DDRMC_CR105_RDLVL_DL_0(0), 105 },
+       { DDRMC_CR106_RDLVL_GTDL_0(4), 106 },
+       { DDRMC_CR110_RDLVL_DL_1(0) | DDRMC_CR110_RDLVL_GTDL_1(4), 110 },
+       /* AXI */
+       { DDRMC_CR117_AXI0_W_PRI(0) | DDRMC_CR117_AXI0_R_PRI(0), 117 },
+       { DDRMC_CR118_AXI1_W_PRI(1) | DDRMC_CR118_AXI1_R_PRI(1), 118 },
+       { DDRMC_CR120_AXI0_PRI1_RPRI(2) |
+                  DDRMC_CR120_AXI0_PRI0_RPRI(2), 120 },
+       { DDRMC_CR121_AXI0_PRI3_RPRI(2) |
+                  DDRMC_CR121_AXI0_PRI2_RPRI(2), 121 },
+       { DDRMC_CR122_AXI1_PRI1_RPRI(1) | DDRMC_CR122_AXI1_PRI0_RPRI(1) |
+                  DDRMC_CR122_AXI0_PRIRLX(100), 122 },
+       { DDRMC_CR123_AXI1_P_ODR_EN | DDRMC_CR123_AXI1_PRI3_RPRI(1) |
+                  DDRMC_CR123_AXI1_PRI2_RPRI(1), 123 },
+       { DDRMC_CR124_AXI1_PRIRLX(100), 124 },
+       { DDRMC_CR126_PHY_RDLAT(8), 126 },
+       { DDRMC_CR132_WRLAT_ADJ(5) |
+                  DDRMC_CR132_RDLAT_ADJ(6), 132 },
+       { DDRMC_CR137_PHYCTL_DL(2), 137 },
+       { DDRMC_CR138_PHY_WRLV_MXDL(256) |
+                  DDRMC_CR138_PHYDRAM_CK_EN(1), 138 },
+       { DDRMC_CR139_PHY_WRLV_RESPLAT(4) | DDRMC_CR139_PHY_WRLV_LOAD(7) |
+                  DDRMC_CR139_PHY_WRLV_DLL(3) |
+                  DDRMC_CR139_PHY_WRLV_EN(3), 139 },
+       { DDRMC_CR140_PHY_WRLV_WW(64), 140 },
+       { DDRMC_CR143_RDLV_GAT_MXDL(1536) |
+                  DDRMC_CR143_RDLV_MXDL(128), 143 },
+       { DDRMC_CR144_PHY_RDLVL_RES(4) | DDRMC_CR144_PHY_RDLV_LOAD(7) |
+                  DDRMC_CR144_PHY_RDLV_DLL(3) |
+                  DDRMC_CR144_PHY_RDLV_EN(3), 144 },
+       { DDRMC_CR145_PHY_RDLV_RR(64), 145 },
+       { DDRMC_CR146_PHY_RDLVL_RESP(64), 146 },
+       { DDRMC_CR147_RDLV_RESP_MASK(983040), 147 },
+       { DDRMC_CR148_RDLV_GATE_RESP_MASK(983040), 148 },
+       { DDRMC_CR151_RDLV_GAT_DQ_ZERO_CNT(1) |
+                  DDRMC_CR151_RDLVL_DQ_ZERO_CNT(1), 151 },
+
+       { DDRMC_CR154_PAD_ZQ_EARLY_CMP_EN_TIMER(13) |
+                  DDRMC_CR154_PAD_ZQ_MODE(1) |
+                  DDRMC_CR154_DDR_SEL_PAD_CONTR(3) |
+                  DDRMC_CR154_PAD_ZQ_HW_FOR(1), 154 },
+       { DDRMC_CR155_PAD_ODT_BYTE1(1) | DDRMC_CR155_PAD_ODT_BYTE0(1), 155 },
+       { DDRMC_CR158_TWR(6), 158 },
+       { DDRMC_CR161_ODT_EN(1) | DDRMC_CR161_TODTH_RD(2) |
+                  DDRMC_CR161_TODTH_WR(2), 161 },
+       /* end marker */
+       { 0, -1 }
+};
+
 int dram_init(void)
 {
-       struct ddrmc_lvl_info lvl = {
-               .wrlvl_reg_en = 1,
-               .wrlvl_dl_0 = 0,
-               .wrlvl_dl_1 = 0,
-               .rdlvl_gt_reg_en = 1,
-               .rdlvl_gt_dl_0 = 4,
-               .rdlvl_gt_dl_1 = 4,
-               .rdlvl_reg_en = 1,
-               .rdlvl_dl_0 = 0,
-               .rdlvl_dl_1 = 0,
-       };
-
        static const struct ddr3_jedec_timings timings = {
-               .tinit           = 5,
-               .trst_pwron      = 80000,
-               .cke_inactive    = 200000,
-               .wrlat           = 5,
-               .caslat_lin      = 12,
-               .trc             = 21,
-               .trrd            = 4,
-               .tccd            = 4,
-               .tfaw            = 20,
-               .trp             = 6,
-               .twtr            = 4,
-               .tras_min        = 15,
-               .tmrd            = 4,
-               .trtp            = 4,
-               .tras_max        = 28080,
-               .tmod            = 12,
-               .tckesr          = 4,
-               .tcke            = 3,
-               .trcd_int        = 6,
-               .tdal            = 12,
-               .tdll            = 512,
-               .trp_ab          = 6,
-               .tref            = 3120,
-               .trfc            = 44,
-               .tpdex           = 3,
-               .txpdll          = 10,
-               .txsnr           = 48,
-               .txsr            = 468,
-               .cksrx           = 5,
-               .cksre           = 5,
-               .zqcl            = 256,
-               .zqinit          = 512,
-               .zqcs            = 64,
-               .ref_per_zq      = 64,
-               .aprebit         = 10,
-               .wlmrd           = 40,
-               .wldqsen         = 25,
+               .tinit             = 5,
+               .trst_pwron        = 80000,
+               .cke_inactive      = 200000,
+               .wrlat             = 5,
+               .caslat_lin        = 12,
+               .trc               = 21,
+               .trrd              = 4,
+               .tccd              = 4,
+               .tbst_int_interval = 0,
+               .tfaw              = 20,
+               .trp               = 6,
+               .twtr              = 4,
+               .tras_min          = 15,
+               .tmrd              = 4,
+               .trtp              = 4,
+               .tras_max          = 28080,
+               .tmod              = 12,
+               .tckesr            = 4,
+               .tcke              = 3,
+               .trcd_int          = 6,
+               .tras_lockout      = 0,
+               .tdal              = 12,
+               .bstlen            = 3,
+               .tdll              = 512,
+               .trp_ab            = 6,
+               .tref              = 3120,
+               .trfc              = 44,
+               .tref_int          = 0,
+               .tpdex             = 3,
+               .txpdll            = 10,
+               .txsnr             = 48,
+               .txsr              = 468,
+               .cksrx             = 5,
+               .cksre             = 5,
+               .freq_chg_en       = 0,
+               .zqcl              = 256,
+               .zqinit            = 512,
+               .zqcs              = 64,
+               .ref_per_zq        = 64,
+               .zqcs_rotate       = 0,
+               .aprebit           = 10,
+               .cmd_age_cnt       = 64,
+               .age_cnt           = 64,
+               .q_fullness        = 7,
+               .odt_rd_mapcs0     = 0,
+               .odt_wr_mapcs0     = 1,
+               .wlmrd             = 40,
+               .wldqsen           = 25,
        };
 
-       ddrmc_setup_iomux();
+       ddrmc_setup_iomux(NULL, 0);
 
-       ddrmc_ctrl_init_ddr3(&timings, &lvl, 1, 3);
+       ddrmc_ctrl_init_ddr3(&timings, vf610twr_cr_settings, NULL, 1, 3);
        gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
 
        return 0;
@@ -181,7 +235,7 @@ static void setup_iomux_qspi(void)
        imx_iomux_v3_setup_multiple_pads(qspi0_pads, ARRAY_SIZE(qspi0_pads));
 }
 
-#ifdef CONFIG_FSL_ESDHC
+#ifdef CONFIG_FSL_ESDHC_IMX
 struct fsl_esdhc_cfg esdhc_cfg[1] = {
        {ESDHC1_BASE_ADDR},
 };