Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7c18dc0 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'remotes/lorenzo/pci/controller-misc' 

  - Remove redundant controller tests for "device_type == pci" (Rob
    Herring)

  - Document R-Car E3 (R8A77990) bindings (Tho Vu)

  - Add device tree support for R-Car r8a7744 (Biju Das)

  - Drop unused mvebu PCIe capability code (Thomas Petazzoni)

  - Add shared PCI bridge emulation code (Thomas Petazzoni)

  - Convert mvebu to use shared PCI bridge emulation (Thomas Petazzoni)

  - Add aardvark Root Port emulation (Thomas Petazzoni)

* remotes/lorenzo/pci/controller-misc:
  PCI: aardvark: Implement emulated root PCI bridge config space
  PCI: mvebu: Convert to PCI emulated bridge config space
  PCI: mvebu: Drop unused PCI express capability code
  PCI: Introduce PCI bridge emulated config space common logic
  dt-bindings: PCI: rcar: Add device tree support for r8a7744
  dt-bindings: PCI: rcar: Add device tree support for r8a7744
  DT: pci: rcar-pci: document R8A77990 bindings
  PCI: Remove unnecessary check of device_type == pci
parents 61ce5809 8a3ebd8d

Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ OHCI and EHCI controllers. 


Required properties:

- compatible: "renesas,pci-r8a7743" for the R8A7743 SoC;

	      "renesas,pci-r8a7744" for the R8A7744 SoC;

	      "renesas,pci-r8a7745" for the R8A7745 SoC;

	      "renesas,pci-r8a7790" for the R8A7790 SoC;

	      "renesas,pci-r8a7791" for the R8A7791 SoC;

Documentation/devicetree/bindings/pci/rcar-pci.txt

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


Required properties:

compatible: "renesas,pcie-r8a7743" for the R8A7743 SoC;

	    "renesas,pcie-r8a7744" for the R8A7744 SoC;

	    "renesas,pcie-r8a7779" for the R8A7779 SoC;

	    "renesas,pcie-r8a7790" for the R8A7790 SoC;

	    "renesas,pcie-r8a7791" for the R8A7791 SoC;
@@ -9,6 +10,7 @@ compatible: "renesas,pcie-r8a7743" for the R8A7743 SoC; 
	    "renesas,pcie-r8a7795" for the R8A7795 SoC;

	    "renesas,pcie-r8a7796" for the R8A7796 SoC;

	    "renesas,pcie-r8a77980" for the R8A77980 SoC;

	    "renesas,pcie-r8a77990" for the R8A77990 SoC;

	    "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 or

				     RZ/G1 compatible device.

	    "renesas,pcie-rcar-gen3" for a generic R-Car Gen3 compatible device.

drivers/pci/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ config PCI_ECAM 
config PCI_LOCKLESS_CONFIG

	bool



config PCI_BRIDGE_EMUL

	bool



config PCI_IOV

	bool "PCI IOV support"

	depends on PCI

drivers/pci/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ 
obj-$(CONFIG_PCI_MSI)		+= msi.o

obj-$(CONFIG_PCI_ATS)		+= ats.o

obj-$(CONFIG_PCI_IOV)		+= iov.o

obj-$(CONFIG_PCI_BRIDGE_EMUL)	+= pci-bridge-emul.o

obj-$(CONFIG_ACPI)		+= pci-acpi.o

obj-$(CONFIG_PCI_LABEL)		+= pci-label.o

obj-$(CONFIG_X86_INTEL_MID)	+= pci-mid.o

drivers/pci/controller/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -9,12 +9,14 @@ config PCI_MVEBU 
	depends on MVEBU_MBUS

	depends on ARM

	depends on OF

	select PCI_BRIDGE_EMUL



config PCI_AARDVARK

	bool "Aardvark PCIe controller"

	depends on (ARCH_MVEBU && ARM64) || COMPILE_TEST

	depends on OF

	depends on PCI_MSI_IRQ_DOMAIN

	select PCI_BRIDGE_EMUL

	help

	 Add support for Aardvark 64bit PCIe Host Controller. This

	 controller is part of the South Bridge of the Marvel Armada