Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1e02cea authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by Bjorn Helgaas
Browse files

PCI: iproc: Allow override of device tree IRQ mapping function 

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: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarRay Jui <rjui@broadcom.com.com>
parent 5ebe6afa

drivers/pci/host/pcie-iproc-platform.c

+2 −0
Original line number Diff line number Diff line
@@ -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");

drivers/pci/host/pcie-iproc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/pci/host/pcie-iproc.h

+1 −0
Original line number Diff line number Diff line
@@ -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);