Merge branches 'pci/demodularize-hosts' and 'pci/host-request-windows' into next

* pci/demodularize-hosts:
  PCI: xgene: Make explicitly non-modular
  PCI: thunder-pem: Make explicitly non-modular
  PCI: thunder-ecam: Make explicitly non-modular
  PCI: tegra: Make explicitly non-modular
  PCI: rcar-gen2: Make explicitly non-modular
  PCI: rcar: Make explicitly non-modular
  PCI: mvebu: Make explicitly non-modular
  PCI: layerscape: Make explicitly non-modular
  PCI: keystone: Make explicitly non-modular
  PCI: hisi: Make explicitly non-modular
  PCI: generic: Make explicitly non-modular
  PCI: designware-plat: Make it explicitly non-modular
  PCI: artpec6: Make explicitly non-modular
  PCI: armada8k: Make explicitly non-modular
  PCI: artpec: Add PCI_MSI_IRQ_DOMAIN dependency
  PCI: artpec: Add Axis ARTPEC-6 PCIe controller driver
  PCI: Add DT binding for Axis ARTPEC-6 PCIe controller
  PCI: generic: Select IRQ_DOMAIN

* pci/host-request-windows:
  PCI: versatile: Simplify host bridge window iteration
  PCI: versatile: Request host bridge window resources with core function
  PCI: tegra: Request host bridge window resources with core function
  PCI: tegra: Remove top-level resource from hierarchy
  PCI: rcar: Simplify host bridge window iteration
  PCI: rcar: Request host bridge window resources with core function
  PCI: rcar Gen2: Request host bridge window resources
  PCI: rcar: Drop gen2 dummy I/O port region
  ARM: Make PCI I/O space optional
  PCI: mvebu: Request host bridge window resources with core function
  PCI: generic: Simplify host bridge window iteration
  PCI: generic: Request host bridge window resources with core function
  PCI: altera: Simplify host bridge window iteration
  PCI: altera: Request host bridge window resources with core function
  PCI: xilinx-nwl: Use dev_printk() when possible
  PCI: xilinx-nwl: Request host bridge window resources
  PCI: xilinx-nwl: Free bridge resource list on failure
  PCI: xilinx: Request host bridge window resources
  PCI: xilinx: Free bridge resource list on failure
  PCI: xgene: Request host bridge window resources
  PCI: xgene: Free bridge resource list on failure
  PCI: iproc: Request host bridge window resources
  PCI: designware: Simplify host bridge window iteration
  PCI: designware: Request host bridge window resources
  PCI: designware: Free bridge resource list on failure
  PCI: Add devm_request_pci_bus_resources()

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/kernel/bios32.c
Simple merge

diff --cc drivers/pci/bus.c
Simple merge

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

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

diff --cc drivers/pci/host/pci-host-generic.c
index f0ca6de,c5cbaf1,6eaceab..c05ea9d
--- 1/drivers/pci/host/pci-host-generic.c
--- 2/drivers/pci/host/pci-host-generic.c
--- 3/drivers/pci/host/pci-host-generic.c
+++ b/drivers/pci/host/pci-host-generic.c
@@@@ -20,12 -20,13 -20,13 +20,12 @@@@
    */
   
   #include <linux/kernel.h>
- -#include <linux/module.h>
+ +#include <linux/init.h>
   #include <linux/of_address.h>
   #include <linux/of_pci.h>
 ++#include <linux/pci-ecam.h>
   #include <linux/platform_device.h>
   
 --#include "../ecam.h"
 --
   static struct pci_ecam_ops gen_pci_cfg_cam_bus_ops = {
        .bus_shift      = 16,
        .pci_ops        = {

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

diff --cc drivers/pci/host/pci-rcar-gen2.c
Simple merge

diff --cc drivers/pci/host/pci-tegra.c
index c388468,54098a8,6e6ef0d..584777e
--- 1/drivers/pci/host/pci-tegra.c
--- 2/drivers/pci/host/pci-tegra.c
--- 3/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@@@ -623,21 -625,21 -622,11 +624,11 @@@@ static int tegra_pcie_setup(int nr, str
        sys->mem_offset = pcie->offset.mem;
        sys->io_offset = pcie->offset.io;
   
--      err = devm_request_resource(pcie->dev, &pcie->all, &pcie->io);
-       if (err < 0)
-               return err;
-  
-       err = devm_request_resource(pcie->dev, &ioport_resource, &pcie->pio);
-       if (err < 0)
-               return err;
-  
-       err = devm_request_resource(pcie->dev, &pcie->all, &pcie->mem);
++      err = devm_request_resource(pcie->dev, &iomem_resource, &pcie->io);
        if (err < 0)
                return err;
   
 -      err = devm_request_resource(pcie->dev, &ioport_resource, &pcie->pio);
 -      if (err < 0)
 -              return err;
 - 
 -      err = devm_request_resource(pcie->dev, &pcie->all, &pcie->mem);
 -      if (err < 0)
 -              return err;
 - 
--      err = devm_request_resource(pcie->dev, &pcie->all, &pcie->prefetch);
--      if (err)
--              return err;
++      pci_ioremap_io(pcie->pio.start, pcie->io.start);
   
        pci_add_resource_offset(&sys->resources, &pcie->pio, sys->io_offset);
        pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);

diff --cc drivers/pci/host/pci-thunder-ecam.c
Simple merge

diff --cc drivers/pci/host/pci-thunder-pem.c
index 91f6fc6,7b335e6,9b8ab94..6abaf80
--- 1/drivers/pci/host/pci-thunder-pem.c
--- 2/drivers/pci/host/pci-thunder-pem.c
--- 3/drivers/pci/host/pci-thunder-pem.c
+++ b/drivers/pci/host/pci-thunder-pem.c
@@@@ -15,12 -15,13 -15,13 +15,12 @@@@
    */
   
   #include <linux/kernel.h>
- -#include <linux/module.h>
+ +#include <linux/init.h>
   #include <linux/of_address.h>
   #include <linux/of_pci.h>
 ++#include <linux/pci-ecam.h>
   #include <linux/platform_device.h>
   
 --#include "../ecam.h"
 --
   #define PEM_CFG_WR 0x28
   #define PEM_CFG_RD 0x30
   

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

diff --cc drivers/pci/host/pcie-rcar.c
index 3509218,04b8357,6546ca7..65db7a2
--- 1/drivers/pci/host/pcie-rcar.c
--- 2/drivers/pci/host/pcie-rcar.c
--- 3/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@@@ -936,13 -938,12 -936,8 +938,7 @@@@ static const struct of_device_id rcar_p
        { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init },
        {},
   };
- -MODULE_DEVICE_TABLE(of, rcar_pcie_of_match);
-  
-  static void rcar_pcie_release_of_pci_ranges(struct rcar_pcie *pci)
-  {
-       pci_free_resource_list(&pci->resources);
-  }
   
 - static void rcar_pcie_release_of_pci_ranges(struct rcar_pcie *pci)
 - {
 -      pci_free_resource_list(&pci->resources);
 - }
 - 
   static int rcar_pcie_parse_request_of_pci_ranges(struct rcar_pcie *pci)
   {
        int err;

diff --cc include/linux/pci.h
Simple merge