Merge branches 'pci/host', 'pci/host-designware', 'pci/host-hisi', 'pci/host-qcom...

* pci/host:
  PCI: host: Add of_pci_get_host_bridge_resources() stub
  PCI: host: Mark PCIe/PCI (MSI) IRQ cascade handlers as IRQF_NO_THREAD

* pci/host-designware:
  PCI: designware: Make config accessor override checking symmetric
  PCI: designware: Simplify control flow

* pci/host-hisi:
  PCI: hisi: Add support for HiSilicon Hip06 PCIe host controllers

* pci/host-qcom:
  ARM: dts: ifc6410: enable PCIe DT node for this board
  ARM: dts: apq8064: add PCIe devicetree node
  PCI: qcom: Add Qualcomm PCIe controller driver
  PCI: qcom: Document PCIe devicetree bindings
  PCI: designware: Ensure ATU is enabled before IO/conf space accesses

* pci/host-rcar:
  PCI: rcar: Add Gen2 PHY setup to pcie-rcar
  PCI: rcar: Add runtime PM support to pcie-rcar
  PCI: rcar: Remove unused pci_sys_data struct from pcie-rcar

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/pci/host/Kconfig
index 98ce5474d26ec63142a8a07576668188bfd5ffd3,f131ba947dc6fe47941b09b0e6d1d35f2a53c255,f131ba947dc6fe47941b09b0e6d1d35f2a53c255,3f73587196c7c4492f4cc5b9262e9a8102f6a2a3,de18298c45273c4193203c093574eb0e02650924,86c2a129a80f6206d8c4a86fb55111c457f7dd3e..6d181ba09ccd5f0d496f1f0787b2dac85eb48474
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
--- 3/drivers/pci/host/Kconfig
--- 4/drivers/pci/host/Kconfig
--- 5/drivers/pci/host/Kconfig
--- 6/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@@@@@ -177,6 -170,6 -170,6 -170,7 -170,16 -169,6 +177,17 @@@@@@@ config PCI_HIS
        select PCIEPORTBUS
        select PCIE_DW
        help
--- --    Say Y here if you want PCIe controller support on HiSilicon HIP05 SoC
+++ ++    Say Y here if you want PCIe controller support on HiSilicon
+++ ++    Hip05 and Hip06 SoCs
+++  +
++++ +config PCIE_QCOM
++++ +  bool "Qualcomm PCIe controller"
++++ +  depends on ARCH_QCOM && OF
++++ +  select PCIE_DW
++++ +  select PCIEPORTBUS
++++ +  help
++++ +    Say Y here to enable PCIe controller support on Qualcomm SoCs. The
++++ +    PCIe controller uses the Designware core plus Qualcomm-specific
++++ +    hardware wrappers.
   +  
      endmenu

diff --cc drivers/pci/host/Makefile
Simple merge

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

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

diff --cc drivers/pci/host/pcie-rcar.c
index 5c2962646b175ceb9257abf0cb971683c766d366,414c3368662186793c634af12fa5700414b8eea6,f4fa6c537448cae9d25519a8697e212aa70facaa,f4fa6c537448cae9d25519a8697e212aa70facaa,f4fa6c537448cae9d25519a8697e212aa70facaa,d6f140aa2efeec4c136c47be45103517d8423bc1..4edb5181f4e2ca64dc24d8c2cc1ebec46b2d7384
--- 1/drivers/pci/host/pcie-rcar.c
--- 2/drivers/pci/host/pcie-rcar.c
--- 3/drivers/pci/host/pcie-rcar.c
--- 4/drivers/pci/host/pcie-rcar.c
--- 5/drivers/pci/host/pcie-rcar.c
--- 6/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@@@@@@ -124,19 -126,20 -126,20 -126,20 -126,20 -130,10 +130,10 @@@@@@@ static inline struct rcar_msi *to_rcar_
      }
      
      /* Structure representing the PCIe interface */
----- /*
-----  * ARM pcibios functions expect the ARM struct pci_sys_data as the PCI
-----  * sysdata.  Add pci_sys_data as the first element in struct gen_pci so
-----  * that when we use a gen_pci pointer as sysdata, it is also a pointer to
-----  * a struct pci_sys_data.
-----  */
      struct rcar_pcie {
----- #ifdef CONFIG_ARM
-----   struct pci_sys_data     sys;
----- #endif
        struct device           *dev;
        void __iomem            *base;
 ----   struct resource         res[RCAR_PCI_MAX_RESOURCES];
 ----   struct resource         busn;
 ++++   struct list_head        resources;
        int                     root_bus_nr;
        struct clk              *clk;
        struct clk              *bus_clk;
@@@@@@@ -915,10 -919,8 -917,8 -917,8 -917,8 -932,10 +934,10 @@@@@@@ static int rcar_pcie_parse_map_dma_rang
      
      static const struct of_device_id rcar_pcie_of_match[] = {
        { .compatible = "renesas,pcie-r8a7779", .data = rcar_pcie_hw_init_h1 },
-       { .compatible = "renesas,pcie-rcar-gen2", .data = rcar_pcie_hw_init },
-----   { .compatible = "renesas,pcie-r8a7790", .data = rcar_pcie_hw_init },
-----   { .compatible = "renesas,pcie-r8a7791", .data = rcar_pcie_hw_init },
+++++   { .compatible = "renesas,pcie-rcar-gen2", .data = rcar_pcie_hw_init_gen2 },
+++++   { .compatible = "renesas,pcie-r8a7790", .data = rcar_pcie_hw_init_gen2 },
+++++   { .compatible = "renesas,pcie-r8a7791", .data = rcar_pcie_hw_init_gen2 },
 ++++   { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init },
        {},
      };
      MODULE_DEVICE_TABLE(of, rcar_pcie_of_match);