Merge remote-tracking branch 'lorenzo/pci/cadence' into next

Browse source

* lorenzo/pci/cadence:
  PCI: cadence: Add EndPoint Controller driver for Cadence PCIe controller
  dt-bindings: PCI: cadence: Add DT bindings for Cadence PCIe endpoint controller
  PCI: endpoint: Fix EPF device name to support multi-function devices
  PCI: endpoint: Add the function number as argument to EPC ops
  PCI: cadence: Add host driver for Cadence PCIe controller
  dt-bindings: PCI: cadence: Add DT bindings for Cadence PCIe host controller
  PCI: Add vendor ID for Cadence
  PCI: Add generic function to probe PCI host controllers
  PCI: generic: fix missing call of pci_free_resource_list()
  PCI: OF: Add generic function to parse and allocate PCI resources
  PCI: Regroup all PCI related entries into drivers/pci/Makefile

Conflicts:
	drivers/pci/of.c
	include/linux/pci.h

...

This commit is contained in:

Bjorn Helgaas 2018-01-31 10:21:33 -06:00 • committed by Bjorn Helgaas

parent a07ae842e2 37dddf14f1

commit c7f75aecb2

24 changed files with 1695 additions and 149 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

43

include/linux/pci-epc.h

View file

12

include/linux/pci.h

View file

2

include/linux/pci_ids.h

View file