Merge branch 'lorenzo/pci/rcar' · tjh.dev/kernel@df25d40

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

authored by

Bjorn Helgaas and committed by

Bjorn Helgaas 8 years ago df25d407 11ee0905

+4 -3

2 changed files

expand all

Documentation

devicetree

bindings

pci

rcar-pci.txt

drivers

pci

host

pci-rcar-gen2.c

+4 -2

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

··· 1 1 * Renesas R-Car PCIe interface 2 2 3 3 Required properties: 4 - compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC; 4 + compatible: "renesas,pcie-r8a7743" for the R8A7743 SoC; 5 + "renesas,pcie-r8a7779" for the R8A7779 SoC; 5 6 "renesas,pcie-r8a7790" for the R8A7790 SoC; 6 7 "renesas,pcie-r8a7791" for the R8A7791 SoC; 7 8 "renesas,pcie-r8a7793" for the R8A7793 SoC; 8 9 "renesas,pcie-r8a7795" for the R8A7795 SoC; 9 10 "renesas,pcie-r8a7796" for the R8A7796 SoC; 10 - "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device. 11 + "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 or 12 + RZ/G1 compatible device. 11 13 "renesas,pcie-rcar-gen3" for a generic R-Car Gen3 compatible device. 12 14 13 15 When compatible with the generic version, nodes must list the

-1

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