diff options
| author | York Sun <yorksun@freescale.com> | 2013-11-18 10:29:32 -0800 |
|---|---|---|
| committer | York Sun <yorksun@freescale.com> | 2013-11-25 11:43:46 -0800 |
| commit | 9a17eb5b7e7ba528c278a9677c38d7ae722d93ec (patch) | |
| tree | 5df092304229af616adb25b47d31a01ca0cf7d90 /drivers/ddr/fsl/mpc86xx_ddr.c | |
| parent | 5614e71b4956c579cd4419b958b33fa6316eaa92 (diff) | |
| download | talos-obmc-uboot-9a17eb5b7e7ba528c278a9677c38d7ae722d93ec.tar.gz talos-obmc-uboot-9a17eb5b7e7ba528c278a9677c38d7ae722d93ec.zip | |
Driver/DDR: combine ccsr_ddr for 83xx, 85xx and 86xx
Fix ccsr_ddr structure to avoid using typedef. Combine DDR2 and DDR3
structure for 83xx, 85xx and 86xx.
Signed-off-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'drivers/ddr/fsl/mpc86xx_ddr.c')
| -rw-r--r-- | drivers/ddr/fsl/mpc86xx_ddr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ddr/fsl/mpc86xx_ddr.c b/drivers/ddr/fsl/mpc86xx_ddr.c index caffbaf019..4551ed87db 100644 --- a/drivers/ddr/fsl/mpc86xx_ddr.c +++ b/drivers/ddr/fsl/mpc86xx_ddr.c @@ -18,7 +18,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, unsigned int ctrl_num, int step) { unsigned int i; - volatile ccsr_ddr_t *ddr; + struct ccsr_ddr __iomem *ddr; switch (ctrl_num) { case 0: @@ -58,7 +58,7 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, out_be32(&ddr->sdram_cfg_2, regs->ddr_sdram_cfg_2); out_be32(&ddr->sdram_mode, regs->ddr_sdram_mode); out_be32(&ddr->sdram_mode_2, regs->ddr_sdram_mode_2); - out_be32(&ddr->sdram_mode_cntl, regs->ddr_sdram_md_cntl); + out_be32(&ddr->sdram_md_cntl, regs->ddr_sdram_md_cntl); out_be32(&ddr->sdram_interval, regs->ddr_sdram_interval); out_be32(&ddr->sdram_data_init, regs->ddr_data_init); out_be32(&ddr->sdram_clk_cntl, regs->ddr_sdram_clk_cntl); |
