54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
|
From c1e02ceaf5739d32f092ac07bf886a0281ec40b1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
Date: Tue, 12 May 2015 23:23:00 +0200
|
||
|
|
Subject: [PATCH 1/2] 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: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
|
||
|
|
Reviewed-by: Ray Jui <rjui@broadcom.com.com>
|
||
|
|
---
|
||
|
|
drivers/pci/host/pcie-iproc-platform.c | 2 ++
|
||
|
|
drivers/pci/host/pcie-iproc.c | 2 +-
|
||
|
|
drivers/pci/host/pcie-iproc.h | 1 +
|
||
|
|
3 files changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
--- a/drivers/pci/host/pcie-iproc-platform.c
|
||
|
|
+++ b/drivers/pci/host/pcie-iproc-platform.c
|
||
|
|
@@ -71,6 +71,8 @@ static int iproc_pcie_pltfm_probe(struct
|
||
|
|
|
||
|
|
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");
|
||
|
|
--- a/drivers/pci/host/pcie-iproc.c
|
||
|
|
+++ b/drivers/pci/host/pcie-iproc.c
|
||
|
|
@@ -229,7 +229,7 @@ int iproc_pcie_setup(struct iproc_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;
|
||
|
|
--- a/drivers/pci/host/pcie-iproc.h
|
||
|
|
+++ b/drivers/pci/host/pcie-iproc.h
|
||
|
|
@@ -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);
|