diff options
author | Luka Perkov <luka@openwrt.org> | 2014-06-04 23:01:30 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2014-06-04 23:01:30 +0000 |
commit | a7e553eb42633eba358971c80b0a5492ee63acf2 (patch) | |
tree | 8b8fe8d3386f09d5097d0ef0dbea65029998db32 /target/linux/imx6/patches-3.14/0060-pci_designware_use-new-OF-interrupt-mapping-when-possible.patch | |
parent | bee803be7f0f537c6b3672bd7c4f4ce1924e743d (diff) | |
download | master-187ad058-a7e553eb42633eba358971c80b0a5492ee63acf2.tar.gz master-187ad058-a7e553eb42633eba358971c80b0a5492ee63acf2.tar.bz2 master-187ad058-a7e553eb42633eba358971c80b0a5492ee63acf2.zip |
imx6: kernel: update 3.14 pcie patches
Remove old irq map patch and replace it with the propper upstream patches
allowing IMX6 PCIe devices behind PCIe switches to work properly.
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@41004 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/imx6/patches-3.14/0060-pci_designware_use-new-OF-interrupt-mapping-when-possible.patch')
-rw-r--r-- | target/linux/imx6/patches-3.14/0060-pci_designware_use-new-OF-interrupt-mapping-when-possible.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/target/linux/imx6/patches-3.14/0060-pci_designware_use-new-OF-interrupt-mapping-when-possible.patch b/target/linux/imx6/patches-3.14/0060-pci_designware_use-new-OF-interrupt-mapping-when-possible.patch new file mode 100644 index 0000000000..fff074a1ed --- /dev/null +++ b/target/linux/imx6/patches-3.14/0060-pci_designware_use-new-OF-interrupt-mapping-when-possible.patch @@ -0,0 +1,58 @@ +commit 62fe03d1dd629a98c6da86cabb2a98b85e89d516 +Author: Lucas Stach <l.stach@pengutronix.de> +Date: Wed Mar 5 14:25:51 2014 +0100 + + PCI: designware: use new OF interrupt mapping when possible + + This is the recommended method of doing the IRQ + mapping. For old devicetrees we fall back to the + previous practice. + + Signed-off-by: Lucas Stach <l.stach@pengutronix.de> + Acked-by: Arnd Bergmann <arnd@arndb.de> + Acked-by: Jingoo Han <jg1.han@samsung.com> + Reviewed-by: Marek Vasut <marex@denx.de> + +--- 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) |