diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2006-11-11 01:24:52 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-04 00:00:14 -0500 |
commit | 69108cf00679716bcab58acb3135390654c5bb99 (patch) | |
tree | 6f0672ef563df33f5fa14c53e4d28dc211e06c81 /arch/powerpc/kernel/pci_32.c | |
parent | f90bb153b1493719d18b4529a46ebfe43220ea6c (diff) |
[POWERPC] Remove ppc_md.pci_map_irq & ppc_swizzle for ARCH=powerpc
These were inherited from ARCH=ppc, but are not needed since parsing of interrupts
should be done via the of_* functions (who can do swizzling). If we ever need to
do non-standard swizzling on bridges without a device-node, then we might add
back a slightly different version of ppc_md.pci_swizzle but for now, that is not
the case.
I removed the couple of calls for these in 83xx. If that breaks something, then
there is a problem with the device-tree on these.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_32.c')
-rw-r--r-- | arch/powerpc/kernel/pci_32.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 853ecef81780..d32cd500d8b8 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
@@ -1283,10 +1283,6 @@ pcibios_init(void) | |||
1283 | if (pci_assign_all_buses && have_of) | 1283 | if (pci_assign_all_buses && have_of) |
1284 | pcibios_make_OF_bus_map(); | 1284 | pcibios_make_OF_bus_map(); |
1285 | 1285 | ||
1286 | /* Do machine dependent PCI interrupt routing */ | ||
1287 | if (ppc_md.pci_swizzle && ppc_md.pci_map_irq) | ||
1288 | pci_fixup_irqs(ppc_md.pci_swizzle, ppc_md.pci_map_irq); | ||
1289 | |||
1290 | /* Call machine dependent fixup */ | 1286 | /* Call machine dependent fixup */ |
1291 | if (ppc_md.pcibios_fixup) | 1287 | if (ppc_md.pcibios_fixup) |
1292 | ppc_md.pcibios_fixup(); | 1288 | ppc_md.pcibios_fixup(); |
@@ -1309,25 +1305,6 @@ pcibios_init(void) | |||
1309 | 1305 | ||
1310 | subsys_initcall(pcibios_init); | 1306 | subsys_initcall(pcibios_init); |
1311 | 1307 | ||
1312 | unsigned char __init | ||
1313 | common_swizzle(struct pci_dev *dev, unsigned char *pinp) | ||
1314 | { | ||
1315 | struct pci_controller *hose = dev->sysdata; | ||
1316 | |||
1317 | if (dev->bus->number != hose->first_busno) { | ||
1318 | u8 pin = *pinp; | ||
1319 | do { | ||
1320 | pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn)); | ||
1321 | /* Move up the chain of bridges. */ | ||
1322 | dev = dev->bus->self; | ||
1323 | } while (dev->bus->self); | ||
1324 | *pinp = pin; | ||
1325 | |||
1326 | /* The slot is the idsel of the last bridge. */ | ||
1327 | } | ||
1328 | return PCI_SLOT(dev->devfn); | ||
1329 | } | ||
1330 | |||
1331 | unsigned long resource_fixup(struct pci_dev * dev, struct resource * res, | 1308 | unsigned long resource_fixup(struct pci_dev * dev, struct resource * res, |
1332 | unsigned long start, unsigned long size) | 1309 | unsigned long start, unsigned long size) |
1333 | { | 1310 | { |