OSDN Git Service

Merge branch 'remotes/lorenzo/pci/aardvark'
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Aug 2018 19:59:09 +0000 (14:59 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 15 Aug 2018 19:59:09 +0000 (14:59 -0500)
commitce342a1aa8c61fe3315b782f6cf4f34d5babce13
treeb03a7d93cb3b9c10c563cb6a8c57164a4ecc69b4
parent0d56768651fc63691552ea59abc4b2ad07a74241
parentc8e144f8ab00e6c4a070a932ef9c57db09aa41cf
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
drivers/pci/controller/pci-aardvark.c