diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-01-14 15:08:50 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-14 15:08:50 +1100 |
| commit | d5f079000b20887bfbc84d772a27709c5665e652 (patch) | |
| tree | 9dc1751898631497d69555d0d1889999450931f7 /arch/powerpc | |
| parent | b4e7de0f3575f4862f04921c5bd0cb5680cc8d71 (diff) | |
| download | op-kernel-dev-d5f079000b20887bfbc84d772a27709c5665e652.zip op-kernel-dev-d5f079000b20887bfbc84d772a27709c5665e652.tar.gz | |
[PATCH] powerpc: Recognize /chaos bridge on old pmacs as PCI
The first generation of PCI powermacs had a host bridge called /chaos
which was for all intents and purposes a PCI host bridge, but has a
device_type of "vci" in the device tree (presumably it's not really
PCI at the hardware level or something).
The OF parsing stuff in arch/powerpc/kernel/prom_parse.c currently
doesn't recognize it as a PCI bridge, which means that controlfb.c
can't get its device addresses.
This makes prom_parse.c recognize a device_type of "vci" as indicating
a PCI host bridge. With this, controlfb works again.
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/prom_parse.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index 309ae1d..a8099c8 100644 --- a/arch/powerpc/kernel/prom_parse.c +++ b/arch/powerpc/kernel/prom_parse.c @@ -113,7 +113,8 @@ static unsigned int of_bus_default_get_flags(u32 *addr) static int of_bus_pci_match(struct device_node *np) { - return !strcmp(np->type, "pci"); + /* "vci" is for the /chaos bridge on 1st-gen PCI powermacs */ + return !strcmp(np->type, "pci") || !strcmp(np->type, "vci"); } static void of_bus_pci_count_cells(struct device_node *np, |
