From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 20 Apr 2018 17:55:32 +0000 (-0500)
Subject: Merge remote-tracking branch 'lorenzo/pci/host/fixes' into for-linus
X-Git-Tag: v4.17-rc3~27^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dd70e51ee01495c1268ee07736352617994aa714;p=linux.git

Merge remote-tracking branch 'lorenzo/pci/host/fixes' into for-linus

  - correct GPIO name to fix HiSilicon Kirin probing issue (Loic Poulain)

  - fix MRRS setting in Marvell Armada Aardvark (Evan Wang)

  - fix interrupts by using ISR1 on Marvell Armada Aardvark (Victor Gu)

  - fix config accesses on Marvell Armada Aardvark (Victor Gu)

* lorenzo/pci/host/fixes:
  PCI: kirin: Fix reset gpio name
  PCI: aardvark: Fix PCIe Max Read Request Size setting
  PCI: aardvark: Use ISR1 instead of ISR0 interrupt in legacy irq mode
  PCI: aardvark: Set PIO_ADDR_LS correctly in advk_pcie_rd_conf()
  PCI: aardvark: Fix logic in advk_pcie_{rd,wr}_conf()
---

dd70e51ee01495c1268ee07736352617994aa714