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

Browse source

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

...

This commit is contained in:

Bjorn Helgaas 2018-04-20 12:55:32 -05:00

parent 60cc43fc88 5db8f8d109

commit dd70e51ee0

2 changed files with 31 additions and 24 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/pci/dwc/pcie-kirin.c

View file

53

drivers/pci/host/pci-aardvark.c

View file