path: root/arch/arm/mach-orion5x/rd88f5182-setup.c
diff options
authorLennert Buytenhek <buytenh@wantstofly.org>2008-04-25 16:28:33 -0400
committerNicolas Pitre <nico@cam.org>2008-04-28 15:58:23 -0400
commit92b913b08b18faa487b0c744282fafd944446ade (patch)
tree1a20f86d3762ebafeb4aea172d35e23ef1ade34f /arch/arm/mach-orion5x/rd88f5182-setup.c
parentfd153abb01c3fbcc47cd4ac3c0bc8801cfcc0009 (diff)
[ARM] Orion: fix ->map_irq() PCIe bus number check
The current orion5x board ->map_irq() routines check whether a given bus number lives on the PCIe controller by comparing it with the PCIe controller's primary bus number. This doesn't work in case there are multiple buses in the PCIe domain, i.e. if there exists a PCIe bridge on the primary PCIe bus. This patch adds a helper function (orion5x_pci_map_irq()) that returns the IRQ number for the given PCI device if that device has a hard-wired IRQ, or -1 otherwise, and makes each board's ->map_irq() function use this helper function. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion5x/rd88f5182-setup.c')
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 37e8b2dc3ed5..b4315dfd4a35 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -172,11 +172,14 @@ void __init rd88f5182_pci_preinit(void)
static int __init rd88f5182_pci_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+ int irq;
- * PCI-E isn't used on the RD2
+ * Check for devices with hard-wired IRQs.
- if (dev->bus->number == orion5x_pcie_local_bus_nr())
+ irq = orion5x_pci_map_irq(dev, slot, pin);
+ if (irq != -1)
+ return irq;
* PCI IRQs are connected via GPIOs