diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2014-04-16 10:24:09 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-04-16 10:24:09 -0600 |
| commit | f8f2fe7355fb04dd129d49ac0ad440beb44f0f79 (patch) | |
| tree | be7791180dd96d4cdffab9bd60a5f569762fe8c9 /drivers/pci | |
| parent | f86b3e392780050e5907f1c0f3cb6c4cc05fd6bb (diff) | |
| download | blackbird-op-linux-f8f2fe7355fb04dd129d49ac0ad440beb44f0f79.tar.gz blackbird-op-linux-f8f2fe7355fb04dd129d49ac0ad440beb44f0f79.zip | |
PCI: rcar: Use new OF interrupt mapping when possible
Use new OF interrupt mapping (of_irq_parse_and_map_pci()) when possible.
This is the recommended method of doing the IRQ mapping. For old
devicetrees we fall back to the previous practice.
This allows interrupts to be remapped across bridges.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/host/pci-rcar-gen2.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c index fd3e3ab56509..4fe349dcaf59 100644 --- a/drivers/pci/host/pci-rcar-gen2.c +++ b/drivers/pci/host/pci-rcar-gen2.c @@ -15,6 +15,7 @@ #include <linux/io.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/of_pci.h> #include <linux/pci.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> @@ -180,8 +181,13 @@ static int rcar_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { struct pci_sys_data *sys = dev->bus->sysdata; struct rcar_pci_priv *priv = sys->private_data; + int irq; + + irq = of_irq_parse_and_map_pci(dev, slot, pin); + if (!irq) + irq = priv->irq; - return priv->irq; + return irq; } #ifdef CONFIG_PCI_DEBUG |
