Browse Source

MIPS: ath79: allow to specify bus number in PCI IRQ maps

This is needed for multiple PCI bus support.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/4913/
Signed-off-by: John Crispin <blogic@openwrt.org>
Gabor Juhos 12 years ago
parent
commit
617fed41e9
2 changed files with 4 additions and 1 deletions
  1. 3 1
      arch/mips/ath79/pci.c
  2. 1 0
      arch/mips/ath79/pci.h

+ 3 - 1
arch/mips/ath79/pci.c

@@ -75,7 +75,9 @@ int __init pcibios_map_irq(const struct pci_dev *dev, uint8_t slot, uint8_t pin)
 		const struct ath79_pci_irq *entry;
 
 		entry = &ath79_pci_irq_map[i];
-		if (entry->slot == slot && entry->pin == pin) {
+		if (entry->bus == dev->bus->number &&
+		    entry->slot == slot &&
+		    entry->pin == pin) {
 			irq = entry->irq;
 			break;
 		}

+ 1 - 0
arch/mips/ath79/pci.h

@@ -14,6 +14,7 @@
 #define _ATH79_PCI_H
 
 struct ath79_pci_irq {
+	int	bus;
 	u8	slot;
 	u8	pin;
 	int	irq;