summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiemo Seufer <ths@networkno.de>2005-07-03 19:16:13 +0000
committerRalf Baechle <ralf@linux-mips.org>2005-10-29 19:31:36 +0100
commit50bd2c72ca72c07d5640e3490845d4b0faf6c124 (patch)
treec66fbaa319dd606a5ef5dcdde813fc5287051b17
parentec125c129e864390deef47f792e3174442e4099f (diff)
downloadblackbird-op-linux-50bd2c72ca72c07d5640e3490845d4b0faf6c124.tar.gz
blackbird-op-linux-50bd2c72ca72c07d5640e3490845d4b0faf6c124.zip
Brian Murphy says:
this fixes Lasat pci to work with multi-function devices by assigning the correct values based on pin number (instead of ignoring them). Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Thiemo Seufer <ths@networkno.de>
-rw-r--r--arch/mips/pci/pci-lasat.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/mips/pci/pci-lasat.c b/arch/mips/pci/pci-lasat.c
index f20fde388083..88fb191ad2eb 100644
--- a/arch/mips/pci/pci-lasat.c
+++ b/arch/mips/pci/pci-lasat.c
@@ -68,11 +68,9 @@ int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
{
switch (slot) {
case 1:
- return LASATINT_PCIA;
case 2:
- return LASATINT_PCIB;
case 3:
- return LASATINT_PCIC;
+ return LASATINT_PCIA + (((slot-1) + (pin-1)) % 4);
case 4:
return LASATINT_ETH1; /* Ethernet 1 (LAN 2) */
case 5:
OpenPOWER on IntegriCloud