pci/fsl_pci_init: Fold pci_setup_indirect into fsl_pci_init

Every platform that calls fsl_pci_init calls pci_setup_indirect before
it calls fsl_pci_init.  There isn't any reason to just call it from
fsl_pci_init and simplify things a bit.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Kumar Gala
2009-08-03 20:44:55 -05:00
parent 5928da0193
commit fb3143b35e
16 changed files with 42 additions and 95 deletions

View File

@ -133,7 +133,7 @@ int fsl_pci_setup_inbound_windows(struct pci_region *r)
return r - rgn_base;
}
void fsl_pci_init(struct pci_controller *hose)
void fsl_pci_init(struct pci_controller *hose, u32 cfg_addr, u32 cfg_data)
{
u16 temp16;
u32 temp32;
@ -144,7 +144,7 @@ void fsl_pci_init(struct pci_controller *hose)
int r;
int bridge;
int inbound = 0;
volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) hose->cfg_addr;
volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *)cfg_addr;
pci_dev_t dev = PCI_BDF(busno,0,0);
/* Initialize ATMU registers based on hose regions and flags */
@ -155,6 +155,8 @@ void fsl_pci_init(struct pci_controller *hose)
int neg_link_w;
#endif
pci_setup_indirect(hose, cfg_addr, cfg_data);
for (r=0; r<hose->region_count; r++) {
u32 sz = (__ilog2_u64((u64)hose->regions[r].size) - 1);
if (hose->regions[r].flags & PCI_REGION_SYS_MEMORY) { /* inbound */