Skip to content

Commit

Permalink
PCI: iproc: Allow override of device tree IRQ mapping function
Browse files Browse the repository at this point in the history
The iProc core PCIe driver defaults to using of_irq_parse_and_map_pci() for
IRQ mapping.  Add iproc_pcie.map_irq so bus interfaces that don't use
device tree can override this by supplying their own IRQ mapping function.

[bhelgaas: changelog]
Posting: http://lkml.kernel.org/r/1431465781-10753-1-git-send-email-hauke@hauke-m.de
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Ray Jui <rjui@broadcom.com.com>
  • Loading branch information
Hauke Mehrtens authored and Bjorn Helgaas committed May 20, 2015
1 parent 5ebe6af commit c1e02ce
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions drivers/pci/host/pcie-iproc-platform.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ static int iproc_pcie_pltfm_probe(struct platform_device *pdev)

pcie->resources = &res;

pcie->map_irq = of_irq_parse_and_map_pci;

ret = iproc_pcie_setup(pcie);
if (ret) {
dev_err(pcie->dev, "PCIe controller setup failed\n");
Expand Down
2 changes: 1 addition & 1 deletion drivers/pci/host/pcie-iproc.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ int iproc_pcie_setup(struct iproc_pcie *pcie)

pci_scan_child_bus(bus);
pci_assign_unassigned_bus_resources(bus);
pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
pci_fixup_irqs(pci_common_swizzle, pcie->map_irq);
pci_bus_add_devices(bus);

return 0;
Expand Down
1 change: 1 addition & 0 deletions drivers/pci/host/pcie-iproc.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ struct iproc_pcie {
struct pci_bus *root_bus;
struct phy *phy;
int irqs[IPROC_PCIE_MAX_NUM_IRQS];
int (*map_irq)(const struct pci_dev *, u8, u8);
};

int iproc_pcie_setup(struct iproc_pcie *pcie);
Expand Down

0 comments on commit c1e02ce

Please sign in to comment.