Skip to content

Commit

Permalink
PCI: tegra: Use new OF interrupt mapping when possible
Browse files Browse the repository at this point in the history
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.

Tested-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Lucas Stach authored and Bjorn Helgaas committed Apr 16, 2014
1 parent f8f2fe7 commit f5d3352
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/pci/host/pci-tegra.c
Original file line number Diff line number Diff line change
Expand Up @@ -639,10 +639,15 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
static int tegra_pcie_map_irq(const struct pci_dev *pdev, u8 slot, u8 pin)
{
struct tegra_pcie *pcie = sys_to_pcie(pdev->bus->sysdata);
int irq;

tegra_cpuidle_pcie_irqs_in_use();

return pcie->irq;
irq = of_irq_parse_and_map_pci(pdev, slot, pin);
if (!irq)
irq = pcie->irq;

return irq;
}

static void tegra_pcie_add_bus(struct pci_bus *bus)
Expand Down

0 comments on commit f5d3352

Please sign in to comment.