diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-02-03 13:58:37 +0400 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2013-02-17 04:25:38 +0400 |
| commit | 617fed41e98417f3ea3e9974be251e125c8796f2 (patch) | |
| tree | e3298802b42e780342ef72acf1068423fe0fc320 | |
| parent | 15b6dcba427d70e61667c28b45e3f090ff00acb1 (diff) | |
| download | linux-617fed41e98417f3ea3e9974be251e125c8796f2.tar.xz | |
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>
| -rw-r--r-- | arch/mips/ath79/pci.c | 4 | ||||
| -rw-r--r-- | arch/mips/ath79/pci.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/mips/ath79/pci.c b/arch/mips/ath79/pci.c index c94bcec169ab..d90e07136383 100644 --- a/arch/mips/ath79/pci.c +++ b/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; } diff --git a/arch/mips/ath79/pci.h b/arch/mips/ath79/pci.h index 51c6625dcc6d..1d00a3803c37 100644 --- a/arch/mips/ath79/pci.h +++ b/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; |