pci/fsl_pci_init: Fold pci_setup_indirect into fsl_pci_init

[u-boot] / board / freescale / mpc8544ds / mpc8544ds.c

diff --git a/board/freescale/mpc8544ds/mpc8544ds.c b/board/freescale/mpc8544ds/mpc8544ds.c
index fd59839b32bdcfc7a8bc21d4050fd102847dd47d..60bde681ea5fe329daf0ea88b9c9c3ca640a5f32 100644 (file)
--- a/board/freescale/mpc8544ds/mpc8544ds.c
+++ b/board/freescale/mpc8544ds/mpc8544ds.c
@@ -166,9 +166,8 @@ pci_init_board(void)
 #endif
                hose->region_count = r - hose->regions;
                hose->first_busno=first_free_busno;
-               pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data);
 
-               fsl_pci_init(hose);
+               fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);
 
                first_free_busno=hose->last_busno+1;
                printf ("    PCIE3 on bus %02x - %02x\n",
@@ -234,9 +233,7 @@ pci_init_board(void)
                hose->region_count = r - hose->regions;
                hose->first_busno=first_free_busno;
 
-               pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data);
-
-               fsl_pci_init(hose);
+               fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);
 
                first_free_busno=hose->last_busno+1;
                printf("    PCIE1 on bus %02x - %02x\n",
@@ -296,9 +293,8 @@ pci_init_board(void)
 #endif
                hose->region_count = r - hose->regions;
                hose->first_busno=first_free_busno;
-               pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data);
 
-               fsl_pci_init(hose);
+               fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);
                first_free_busno=hose->last_busno+1;
                printf ("    PCIE2 on bus %02x - %02x\n",
                        hose->first_busno,hose->last_busno);
@@ -364,9 +360,8 @@ pci_init_board(void)
 #endif
                hose->region_count = r - hose->regions;
                hose->first_busno=first_free_busno;
-               pci_setup_indirect(hose, (int) &pci->cfg_addr, (int) &pci->cfg_data);
 
-               fsl_pci_init(hose);
+               fsl_pci_init(hose, (u32)&pci->cfg_addr, (u32)&pci->cfg_data);
                first_free_busno=hose->last_busno+1;
                printf ("PCI on bus %02x - %02x\n",
                        hose->first_busno,hose->last_busno);