From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 3 Jun 2014 14:45:42 +0000 (-0600)
Subject: Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-mvebu' and 'pci... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=843a85ced99b9c8f8221f11d5cbcc56c2dae2842;p=openwrt%2Fstaging%2Fblogic.git

Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-mvebu' and 'pci/host-tegra' into next

* pci/host-designware:
  PCI: designware: Remove unnecessary use of 'conf_lock' spinlock
  PCI: designware: Use new OF interrupt mapping when possible
  PCI: designware: Fix iATU programming for cfg1, io and mem viewport
  PCI: designware: Fix comment for setting number of lanes

* pci/host-imx6:
  PCI: designware: Split Exynos and i.MX bindings

* pci/host-mvebu:
  PCI: mvebu: Use '%pa' for printing 'phys_addr_t' type
  PCI: mvebu: Remove unnecessary use of 'conf_lock' spinlock
  PCI: mvebu: split PCIe BARs into multiple MBus windows when needed
  bus: mvebu-mbus: allow several windows with the same target/attribute
  bus: mvebu-mbus: Avoid setting an undefined window size
  PCI: mvebu: fix off-by-one in the computed size of the mbus windows

* pci/host-tegra:
  PCI: tegra: Use new OF interrupt mapping when possible
---

843a85ced99b9c8f8221f11d5cbcc56c2dae2842
diff --cc drivers/pci/host/pcie-designware.c
index 77a649dd1473,495846037ca7,77a649dd1473,509a29d84509,509a29d84509..1eaf4df3618a
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@@@@@ -740,8 -731,13 -740,8 -736,8 -736,8 +735,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 pp->irq;
+ +++	return irq;
     }
     
     static void dw_pcie_add_bus(struct pci_bus *bus)