diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-11-29 02:10:09 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-12-11 22:34:20 -0600 |
| commit | 04db400892da37b76a585e332a0c137954ad2015 (patch) | |
| tree | 201c757a3032f786588d94c0fde8469a865b40b5 /board/tqm85xx | |
| parent | 2714223f8e04ab3e4133ff65872eef366d90bfea (diff) | |
| download | u-boot-imx-04db400892da37b76a585e332a0c137954ad2015.zip u-boot-imx-04db400892da37b76a585e332a0c137954ad2015.tar.gz u-boot-imx-04db400892da37b76a585e332a0c137954ad2015.tar.bz2 | |
Stop using immap_t on 85xx
In the future the offsets to various blocks may not be in same location.
Move to using CFG_MPC85xx_*_ADDR as the base of the registers
instead of getting it via &immap.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'board/tqm85xx')
| -rw-r--r-- | board/tqm85xx/sdram.c | 3 | ||||
| -rw-r--r-- | board/tqm85xx/tqm85xx.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/board/tqm85xx/sdram.c b/board/tqm85xx/sdram.c index 8ca50f5..2053ade 100644 --- a/board/tqm85xx/sdram.c +++ b/board/tqm85xx/sdram.c @@ -57,8 +57,7 @@ int cas_latency(void); long int sdram_setup(int casl) { int i; - volatile immap_t *immap = (immap_t *) CFG_IMMR; - volatile ccsr_ddr_t *ddr = &immap->im_ddr; + volatile ccsr_ddr_t *ddr = (void *)(CFG_MPC85xx_DDR_ADDR); unsigned long cfg_ddr_timing1; unsigned long cfg_ddr_mode; diff --git a/board/tqm85xx/tqm85xx.c b/board/tqm85xx/tqm85xx.c index c45676c..5d5cb1b 100644 --- a/board/tqm85xx/tqm85xx.c +++ b/board/tqm85xx/tqm85xx.c @@ -262,8 +262,7 @@ int checkboard (void) int misc_init_r (void) { - volatile immap_t *immap = (immap_t *)CFG_IMMR; - volatile ccsr_lbc_t *memctl = &immap->im_lbc; + volatile ccsr_lbc_t *memctl = (void *)(CFG_MPC85xx_LBC_ADDR); /* * Adjust flash start and offset to detected values @@ -324,9 +323,8 @@ int misc_init_r (void) */ void local_bus_init (void) { - volatile immap_t *immap = (immap_t *) CFG_IMMR; volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); - volatile ccsr_lbc_t *lbc = &immap->im_lbc; + volatile ccsr_lbc_t *lbc = (void *)(CFG_MPC85xx_LBC_ADDR); uint clkdiv; uint lbc_hz; |