diff options
| author | Kim Phillips <kim.phillips@freescale.com> | 2009-01-23 17:48:24 -0600 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2009-01-23 17:48:24 -0600 |
| commit | 833d94bcdc89cf88928be21587240950afdc33c8 (patch) | |
| tree | 52af90dbf1a442961c63ec0bbdd3d0bf643685ec /cpu/mpc83xx/pci.c | |
| parent | 6dadc9195ad642cc662632f4d92f92d3d71e8bf2 (diff) | |
| parent | 5bb907a4925397789c90d074f4f7e92ce6b39402 (diff) | |
Merge branch 'next'
Diffstat (limited to 'cpu/mpc83xx/pci.c')
| -rw-r--r-- | cpu/mpc83xx/pci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpu/mpc83xx/pci.c b/cpu/mpc83xx/pci.c index ab0760bce6..e9965d7df3 100644 --- a/cpu/mpc83xx/pci.c +++ b/cpu/mpc83xx/pci.c @@ -118,10 +118,12 @@ static void pci_init_bus(int bus, struct pci_region *reg) #ifdef CONFIG_PCI_SCAN_SHOW printf("PCI: Bus Dev VenId DevId Class Int\n"); #endif +#ifndef CONFIG_PCISLAVE /* * Hose scan. */ hose->last_busno = pci_hose_scan(hose); +#endif } /* @@ -190,6 +192,9 @@ void mpc83xx_pcislave_unlock(int bus) pci_hose_read_config_word (hose, dev, PCI_FUNCTION_CONFIG, ®16); reg16 &= ~(PCI_FUNCTION_CFG_LOCK); pci_hose_write_config_word (hose, dev, PCI_FUNCTION_CONFIG, reg16); + + /* The configuration bit is now unlocked, so we can scan the bus */ + hose->last_busno = pci_hose_scan(hose); } #endif |