Merge branch 'remotes/lorenzo/pci/aardvark'

  - Remove Aardvark outbound window configuration (Evan Wang)

  - Fix Aardvark bridge window sizing issue (Zachary Zhang)

  - Convert Aardvark to use pci_host_probe() to reduce code duplication
    (Thomas Petazzoni)

* remotes/lorenzo/pci/aardvark:
  PCI: aardvark: Convert to use pci_host_probe()
  PCI: aardvark: Size bridges before resources allocation
  PCI: aardvark: Remove PCIe outbound window configuration
  PCI: aardvark: Introduce an advk_pcie_valid_device() helper

# Conflicts:
#	drivers/pci/controller/pci-aardvark.c

diff --cc drivers/pci/controller/pci-aardvark.c
index 0fae816fba39b3cc09e36850ab101ae64e8c6b9f,d5030cd0619742b29156eff2947db24098fd4af7..6b4555ff254867eb3a7c50841bfe29d62c8f3df5
--- 1/drivers/pci/controller/pci-aardvark.c
--- 2/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@@ -843,13 -809,7 +809,7 @@@ static int advk_pcie_parse_request_of_p
  
                switch (resource_type(res)) {
                case IORESOURCE_IO:
-                       advk_pcie_set_ob_win(pcie, 1,
-                                            upper_32_bits(res->start),
-                                            lower_32_bits(res->start),
-                                            0, 0xF8000000, 0,
-                                            lower_32_bits(res->start),
-                                            OB_PCIE_IO);
 -                      err = pci_remap_iospace(res, iobase);
 +                      err = devm_pci_remap_iospace(dev, res, iobase);
                        if (err) {
                                dev_warn(dev, "error %d: failed to map resource %pR\n",
                                         err, res);