From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 15 Aug 2018 19:59:09 +0000 (-0500)
Subject: Merge branch 'remotes/lorenzo/pci/aardvark'
X-Git-Tag: v4.19~393^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce342a1aa8c61fe3315b782f6cf4f34d5babce13;p=platform%2Fkernel%2Flinux-rpi3.git

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
---

ce342a1aa8c61fe3315b782f6cf4f34d5babce13
diff --cc drivers/pci/controller/pci-aardvark.c
index 0fae816,d5030cd..6b4555f
--- a/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);