diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2006-05-19 16:54:42 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-24 16:08:57 +1000 |
| commit | 095eed4f8d0be13a7934031434b6e9ceddb87ff6 (patch) | |
| tree | 6ae36b38c3cb8ab78e8cc8e019ed226829304ad6 /arch/powerpc/kernel/pci_dn.c | |
| parent | efbd386967aaa7fcf7ffbb13e4975df1cdf04cb8 (diff) | |
| download | linux-stable-095eed4f8d0be13a7934031434b6e9ceddb87ff6.tar.gz linux-stable-095eed4f8d0be13a7934031434b6e9ceddb87ff6.tar.bz2 linux-stable-095eed4f8d0be13a7934031434b6e9ceddb87ff6.zip | |
[PATCH] powerpc: clean up iSeries PCI probe
Only scan the host bridges and then use the existing pci_devs_phb_init()
routine.
Also fix typo in setup of reg property.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_dn.c')
| -rw-r--r-- | arch/powerpc/kernel/pci_dn.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c index 12c4c9e9bbc7..1c18953514c3 100644 --- a/arch/powerpc/kernel/pci_dn.c +++ b/arch/powerpc/kernel/pci_dn.c @@ -31,6 +31,7 @@ #include <asm/pci-bridge.h> #include <asm/pSeries_reconfig.h> #include <asm/ppc-pci.h> +#include <asm/firmware.h> /* * Traverse_func that inits the PCI fields of the device node. @@ -59,6 +60,11 @@ static void * __devinit update_dn_pci_info(struct device_node *dn, void *data) pdn->busno = (regs[0] >> 16) & 0xff; pdn->devfn = (regs[0] >> 8) & 0xff; } + if (firmware_has_feature(FW_FEATURE_ISERIES)) { + u32 *busp = (u32 *)get_property(dn, "linux,subbus", NULL); + if (busp) + pdn->bussubno = *busp; + } pdn->pci_ext_config_space = (type && *type == 1); return NULL; |