diff options
Diffstat (limited to 'target/linux/imx6/patches-3.14/0005-PCI-designware-Use-new-OF-interrupt-mapping-when-pos.patch')
| -rw-r--r-- | target/linux/imx6/patches-3.14/0005-PCI-designware-Use-new-OF-interrupt-mapping-when-pos.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/target/linux/imx6/patches-3.14/0005-PCI-designware-Use-new-OF-interrupt-mapping-when-pos.patch b/target/linux/imx6/patches-3.14/0005-PCI-designware-Use-new-OF-interrupt-mapping-when-pos.patch deleted file mode 100644 index 19db404..0000000 --- a/target/linux/imx6/patches-3.14/0005-PCI-designware-Use-new-OF-interrupt-mapping-when-pos.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 804f57b1a63c7435fe43b36942581cc6c79ebb5c Mon Sep 17 00:00:00 2001 -From: Lucas Stach <l.stach@pengutronix.de> -Date: Wed, 5 Mar 2014 14:25:51 +0100 -Subject: [PATCH] PCI: designware: 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 makes INTB, INTC, and INTD work on i.MX. - -Tested-by: Tim Harvey <tharvey@gateworks.com> -Signed-off-by: Lucas Stach <l.stach@pengutronix.de> -Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> -Reviewed-by: Marek Vasut <marex@denx.de> -Acked-by: Arnd Bergmann <arnd@arndb.de> -Acked-by: Jingoo Han <jg1.han@samsung.com> ---- - drivers/pci/host/pcie-designware.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - ---- a/drivers/pci/host/pcie-designware.c -+++ b/drivers/pci/host/pcie-designware.c -@@ -17,6 +17,7 @@ - #include <linux/module.h> - #include <linux/msi.h> - #include <linux/of_address.h> -+#include <linux/of_pci.h> - #include <linux/pci.h> - #include <linux/pci_regs.h> - #include <linux/types.h> -@@ -492,7 +493,7 @@ int __init dw_pcie_host_init(struct pcie - dw_pci.nr_controllers = 1; - dw_pci.private_data = (void **)&pp; - -- pci_common_init(&dw_pci); -+ pci_common_init_dev(pp->dev, &dw_pci); - pci_assign_unassigned_resources(); - #ifdef CONFIG_PCI_DOMAINS - dw_pci.domain++; -@@ -725,7 +726,7 @@ static struct pci_bus *dw_pcie_scan_bus( - - if (pp) { - pp->root_bus_nr = sys->busnr; -- bus = pci_scan_root_bus(NULL, sys->busnr, &dw_pcie_ops, -+ bus = pci_scan_root_bus(pp->dev, sys->busnr, &dw_pcie_ops, - sys, &sys->resources); - } else { - bus = NULL; -@@ -738,8 +739,13 @@ static struct pci_bus *dw_pcie_scan_bus( - static int dw_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) - { - struct pcie_port *pp = sys_to_pcie(dev->bus->sysdata); -+ int irq; - -- return pp->irq; -+ irq = of_irq_parse_and_map_pci(dev, slot, pin); -+ if (!irq) -+ irq = pp->irq; -+ -+ return irq; - } - - static void dw_pcie_add_bus(struct pci_bus *bus) |