Stop using immap_t on 85xx

[oweals/u-boot.git] / board / stxssa / stxssa.c

diff --git a/board/stxssa/stxssa.c b/board/stxssa/stxssa.c
index 9a2bfbef8e47e05cea28d720ab4bfbb5eb8391d9..e2b38a620565ee622b38047391f171bf5ac2c2b4 100644 (file)
--- a/board/stxssa/stxssa.c
+++ b/board/stxssa/stxssa.c
@@ -252,8 +252,7 @@ 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
@@ -302,8 +301,7 @@ initdram (int board_type)
 
 #if defined(CONFIG_DDR_DLL)
        {
-               volatile immap_t *immap = (immap_t *)CFG_IMMR;
-               volatile ccsr_gur_t *gur= &immap->im_gur;
+               volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR);
                uint temp_ddrdll = 0;
 
                /* Work around to stabilize DDR DLL */
@@ -381,9 +379,11 @@ static struct pci_config_table pci_stxgp3_config_table[] = {
 static struct pci_controller hose[] = {
 #ifndef CONFIG_PCI_PNP
        { config_table: pci_stxgp3_config_table,},
-#ifdef CONFIG_MPC85XX_PCI2
+#else
        {},
 #endif
+#ifdef CONFIG_MPC85XX_PCI2
+       {},
 #endif
 };