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

Commit df25d407 authored Apr 04, 2018 by Bjorn Helgaas Committed by Bjorn Helgaas Apr 04, 2018

Merge branch 'lorenzo/pci/rcar'

* lorenzo/pci/rcar:
  dt-bindings: PCI: rcar: Add device tree support for r8a7743
  PCI: rcar-gen2: Remove duplicated bit-wise or of RCAR_PCI_INT_SIGRETABORT

parents 11ee0905 2380ca5f

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

+4 −2

Original line number	Diff line number	Diff line
		* Renesas R-Car PCIe interface

		Required properties:
		compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC;
		compatible: "renesas,pcie-r8a7743" for the R8A7743 SoC;
		"renesas,pcie-r8a7779" for the R8A7779 SoC;
		"renesas,pcie-r8a7790" for the R8A7790 SoC;
		"renesas,pcie-r8a7791" for the R8A7791 SoC;
		"renesas,pcie-r8a7793" for the R8A7793 SoC;
		"renesas,pcie-r8a7795" for the R8A7795 SoC;
		"renesas,pcie-r8a7796" for the R8A7796 SoC;
		"renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device.
		"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.

		When compatible with the generic version, nodes must list the

drivers/pci/host/pci-rcar-gen2.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,6 @@
		#define RCAR_PCI_INT_B (1 << 17)
		#define RCAR_PCI_INT_PME (1 << 19)
		#define RCAR_PCI_INT_ALLERRORS (RCAR_PCI_INT_SIGTABORT \| \
		RCAR_PCI_INT_SIGRETABORT \| \
		RCAR_PCI_INT_SIGRETABORT \| \
		RCAR_PCI_INT_REMABORT \| \
		RCAR_PCI_INT_PERR \| \