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/mpc85xx_ddr_gen1.c | |
| parent | 5614e71b4956c579cd4419b958b33fa6316eaa92 (diff) | |
| download | olio-uboot-2014.01-9a17eb5b7e7ba528c278a9677c38d7ae722d93ec.tar.xz olio-uboot-2014.01-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/mpc85xx_ddr_gen1.c')
| -rw-r--r-- | drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c index ff7d979d6..8dd4a9136 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c @@ -18,7 +18,8 @@ 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 = (void *)CONFIG_SYS_FSL_DDR_ADDR; + struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)CONFIG_SYS_FSL_DDR_ADDR; if (ctrl_num != 0) { printf("%s unexpected ctrl_num = %u\n", __FUNCTION__, ctrl_num); @@ -73,7 +74,8 @@ void fsl_ddr_set_memctl_regs(const fsl_ddr_cfg_regs_t *regs, void ddr_enable_ecc(unsigned int dram_size) { - volatile ccsr_ddr_t *ddr = (void *)(CONFIG_SYS_FSL_DDR_ADDR); + struct ccsr_ddr __iomem *ddr = + (struct ccsr_ddr __iomem *)(CONFIG_SYS_FSL_DDR_ADDR); dma_meminit(CONFIG_MEM_INIT_VALUE, dram_size); |