Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-mvebu' and 'pci...

* 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

diff --cc drivers/pci/host/pci-exynos.c
Simple merge

diff --cc drivers/pci/host/pci-imx6.c
Simple merge

diff --cc drivers/pci/host/pcie-designware.c
index 77a649d,4958460,77a649d,509a29d,509a29d..1eaf4df
--- 1/drivers/pci/host/pcie-designware.c
--- 2/drivers/pci/host/pcie-designware.c
--- 3/drivers/pci/host/pcie-designware.c
--- 4/drivers/pci/host/pcie-designware.c
--- 5/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);
   --   return pp->irq;
+ +++   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)

diff --cc drivers/pci/host/pcie-designware.h
Simple merge