summaryrefslogtreecommitdiffstats
path: root/board/pm854
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2007-11-29 02:10:09 -0600
committerKumar Gala <galak@kernel.crashing.org>2007-12-11 22:34:20 -0600
commit04db400892da37b76a585e332a0c137954ad2015 (patch)
tree201c757a3032f786588d94c0fde8469a865b40b5 /board/pm854
parent2714223f8e04ab3e4133ff65872eef366d90bfea (diff)
downloadu-boot-04db400892da37b76a585e332a0c137954ad2015.tar.gz
u-boot-04db400892da37b76a585e332a0c137954ad2015.tar.xz
u-boot-04db400892da37b76a585e332a0c137954ad2015.zip
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/pm854')
-rw-r--r--board/pm854/pm854.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/board/pm854/pm854.c b/board/pm854/pm854.c
index 15e948c517..999d8b5259 100644
--- a/board/pm854/pm854.c
+++ b/board/pm854/pm854.c
@@ -45,8 +45,7 @@ long int fixed_sdram(void);
int board_early_init_f (void)
{
#if defined(CONFIG_PCI)
- volatile immap_t *immr = (immap_t *)CFG_IMMR;
- volatile ccsr_pcix_t *pci = &immr->im_pcix;
+ volatile ccsr_pcix_t *pci = (void *)(CFG_MPC85xx_PCIX_ADDR);
pci->peer &= 0xffffffdf; /* disable master abort */
#endif
@@ -132,9 +131,8 @@ initdram(int board_type)
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;
@@ -228,8 +226,7 @@ int testdram (void)
long int fixed_sdram (void)
{
#ifndef CFG_RAMBOOT
- 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);
ddr->cs0_bnds = CFG_DDR_CS0_BNDS;
ddr->cs0_config = CFG_DDR_CS0_CONFIG;