Merge branch 'pci/host-hisi' into next

Browse source

* pci/host-hisi:
  PCI: generic: Call pci_fixup_irqs() only on ARM
  PCI: Disable MSI for HiSilicon Hip06/Hip07 Root Ports
  PCI: hisi: Rename config space accessors to remove "acpi"
  PCI: hisi: Add DT almost-ECAM support for Hip06/Hip07 host controllers
  PCI: hisi: Use of_device_get_match_data() to simplify probe

Conflicts:
	drivers/pci/dwc/pcie-hisi.c

...

This commit is contained in:

Bjorn Helgaas 2017-02-21 15:14:18 -06:00

parent b2e6d3055d 3fb5561879

commit d952097158

5 changed files with 112 additions and 12 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

37

Documentation/devicetree/bindings/pci/hisilicon-pcie.txt

View file

82

drivers/pci/dwc/pcie-hisi.c

View file

2

drivers/pci/host/pci-host-common.c

View file

1

drivers/pci/quirks.c

View file

2

include/linux/pci_ids.h

View file