Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / arch / arm / include / asm / arch-vf610 / ddrmc-vf610.h

diff --git a/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h b/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h
index 6730cde1b806fb178e6c8a42d0a7e9a05c96be22..9022c465a0494c65d426de5916be8adda5736863 100644 (file)
--- a/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h
+++ b/arch/arm/include/asm/arch-vf610/ddrmc-vf610.h
@@ -11,18 +11,6 @@
 #ifndef __ASM_ARCH_VF610_DDRMC_H
 #define __ASM_ARCH_VF610_DDRMC_H
 
-struct ddrmc_lvl_info {
-       u16 wrlvl_reg_en;
-       u16 wrlvl_dl_0;
-       u16 wrlvl_dl_1;
-       u16 rdlvl_gt_reg_en;
-       u16 rdlvl_gt_dl_0;
-       u16 rdlvl_gt_dl_1;
-       u16 rdlvl_reg_en;
-       u16 rdlvl_dl_0;
-       u16 rdlvl_dl_1;
-};
-
 struct ddr3_jedec_timings {
        u8 tinit;
        u32 trst_pwron;
@@ -32,6 +20,7 @@ struct ddr3_jedec_timings {
        u8 trc;
        u8 trrd;
        u8 tccd;
+       u8 tbst_int_interval;
        u8 tfaw;
        u8 trp;
        u8 twtr;
@@ -43,30 +32,51 @@ struct ddr3_jedec_timings {
        u8 tckesr;
        u8 tcke;
        u8 trcd_int;
+       u8 tras_lockout;
        u8 tdal;
+       u8 bstlen;
        u16 tdll;
        u8 trp_ab;
        u16 tref;
        u8 trfc;
+       u16 tref_int;
        u8 tpdex;
        u8 txpdll;
        u8 txsnr;
        u16 txsr;
        u8 cksrx;
        u8 cksre;
+       u8 freq_chg_en;
        u16 zqcl;
        u16 zqinit;
        u8 zqcs;
        u8 ref_per_zq;
+       u8 zqcs_rotate;
        u8 aprebit;
+       u8 cmd_age_cnt;
+       u8 age_cnt;
+       u8 q_fullness;
+       u8 odt_rd_mapcs0;
+       u8 odt_wr_mapcs0;
        u8 wlmrd;
        u8 wldqsen;
 };
 
-void ddrmc_setup_iomux(void);
+struct ddrmc_cr_setting {
+       u32     setting;
+       int     cr_rnum; /* CR register ; -1 for last entry */
+};
+
+struct ddrmc_phy_setting {
+       u32     setting;
+       int     phy_rnum; /* PHY register ; -1 for last entry */
+};
+
+void ddrmc_setup_iomux(const iomux_v3_cfg_t *pads, int pads_count);
 void ddrmc_phy_init(void);
 void ddrmc_ctrl_init_ddr3(struct ddr3_jedec_timings const *timings,
-                                                 struct ddrmc_lvl_info *lvl,
-                                                 int col_diff, int row_diff);
+                         struct ddrmc_cr_setting *board_cr_settings,
+                         struct ddrmc_phy_setting *board_phy_settings,
+                         int col_diff, int row_diff);
 
 #endif