Commit c7f75aec authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Bjorn Helgaas
Browse files

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

* 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
parents a07ae842 37dddf14

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-ep.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
* Cadence PCIe endpoint controller



Required properties:

- compatible: Should contain "cdns,cdns-pcie-ep" to identify the IP used.

- reg: Should contain the controller register base address and AXI interface

  region base address respectively.

- reg-names: Must be "reg" and "mem" respectively.

- cdns,max-outbound-regions: Set to maximum number of outbound regions



Optional properties:

- max-functions: Maximum number of functions that can be configured (default 1).



Example:



pcie@fc000000 {

	compatible = "cdns,cdns-pcie-ep";

	reg = <0x0 0xfc000000 0x0 0x01000000>,

	      <0x0 0x80000000 0x0 0x40000000>;

	reg-names = "reg", "mem";

	cdns,max-outbound-regions = <16>;

	max-functions = /bits/ 8 <8>;

};

Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.txt

0 → 100644
+60 −0
Original line number Diff line number Diff line 
* Cadence PCIe host controller



This PCIe controller inherits the base properties defined in

host-generic-pci.txt.



Required properties:

- compatible: Should contain "cdns,cdns-pcie-host" to identify the IP used.

- reg: Should contain the controller register base address, PCIe configuration

  window base address, and AXI interface region base address respectively.

- reg-names: Must be "reg", "cfg" and "mem" respectively.

- #address-cells: Set to <3>

- #size-cells: Set to <2>

- device_type: Set to "pci"

- ranges: Ranges for the PCI memory and I/O regions

- #interrupt-cells: Set to <1>

- interrupt-map-mask and interrupt-map: Standard PCI properties to define the

  mapping of the PCIe interface to interrupt numbers.



Optional properties:

- cdns,max-outbound-regions: Set to maximum number of outbound regions

  (default 32)

- cdns,no-bar-match-nbits: Set into the no BAR match register to configure the

  number of least significant bits kept during inbound (PCIe -> AXI) address

  translations (default 32)

- vendor-id: The PCI vendor ID (16 bits, default is design dependent)

- device-id: The PCI device ID (16 bits, default is design dependent)



Example:



pcie@fb000000 {

	compatible = "cdns,cdns-pcie-host";

	device_type = "pci";

	#address-cells = <3>;

	#size-cells = <2>;

	bus-range = <0x0 0xff>;

	linux,pci-domain = <0>;

	cdns,max-outbound-regions = <16>;

	cdns,no-bar-match-nbits = <32>;

	vendor-id = /bits/ 16 <0x17cd>;

	device-id = /bits/ 16 <0x0200>;



	reg = <0x0 0xfb000000  0x0 0x01000000>,

	      <0x0 0x41000000  0x0 0x00001000>,

	      <0x0 0x40000000  0x0 0x04000000>;

	reg-names = "reg", "cfg", "mem";



	ranges = <0x02000000 0x0 0x42000000  0x0 0x42000000  0x0 0x1000000>,

		 <0x01000000 0x0 0x43000000  0x0 0x43000000  0x0 0x0010000>;



	#interrupt-cells = <0x1>;



	interrupt-map = <0x0 0x0 0x0  0x1  &gic  0x0 0x0 0x0 14 0x1

			 0x0 0x0 0x0  0x2  &gic  0x0 0x0 0x0 15 0x1

			 0x0 0x0 0x0  0x3  &gic  0x0 0x0 0x0 16 0x1

			 0x0 0x0 0x0  0x4  &gic  0x0 0x0 0x0 17 0x1>;



	interrupt-map-mask = <0x0 0x0 0x0  0x7>;



	msi-parent = <&its_pci>;

};

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -10402,6 +10402,13 @@ S: Maintained 
F:	Documentation/devicetree/bindings/pci/pci-armada8k.txt

F:	drivers/pci/dwc/pcie-armada8k.c



PCI DRIVER FOR CADENCE PCIE IP

M:	Alan Douglas <adouglas@cadence.com>

L:	linux-pci@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/pci/cdns,*.txt

F:	drivers/pci/cadence/pcie-cadence*



PCI DRIVER FOR FREESCALE LAYERSCAPE

M:	Minghuan Lian <minghuan.Lian@freescale.com>

M:	Mingkai Hu <mingkai.hu@freescale.com>

drivers/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ obj-$(CONFIG_PINCTRL) += pinctrl/ 
obj-$(CONFIG_GPIOLIB)		+= gpio/

obj-y				+= pwm/



obj-$(CONFIG_PCI)		+= pci/

obj-$(CONFIG_PCI_ENDPOINT)	+= pci/endpoint/

# PCI dwc controller drivers

obj-y				+= pci/dwc/

obj-y				+= pci/



obj-$(CONFIG_PARISC)		+= parisc/

obj-$(CONFIG_RAPIDIO)		+= rapidio/

drivers/pci/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ config PCI_PASID 


config PCI_LABEL

	def_bool y if (DMI || ACPI)

	depends on PCI

	select NLS



config PCI_HYPERV
@@ -135,6 +136,7 @@ config PCI_HYPERV 
          PCI devices from a PCI backend to support PCI driver domains.



source "drivers/pci/hotplug/Kconfig"

source "drivers/pci/cadence/Kconfig"

source "drivers/pci/dwc/Kconfig"

source "drivers/pci/host/Kconfig"

source "drivers/pci/endpoint/Kconfig"

CRA Git | Maintained and supported by SUSTech CRA and CCSE