diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-12 18:31:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-02-12 18:31:22 -0500 |
commit | 0cbb0b92689a1c4e0ac55f6188be563a813ac808 (patch) | |
tree | c9b5857395e703b3b82043231614bb4266341e0b /Documentation | |
parent | 29f1bf34ed38222372365657b9498af2e3f8c208 (diff) | |
parent | 0cf1337e0b83c16de4e7e98dad3a6afce6043fea (diff) |
Merge tag 'pci-v4.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fixes from Bjorn Helgaas:
"These are some Renesas binding updates for PCI host controllers, a
Broadcom fix for a regression we added in v4.5-rc1, and a fix for an
AER use-after-free problem that can cause memory corruption.
Summary:
AER:
Flush workqueue on device remove to avoid use-after-free (Sebastian Andrzej Siewior)
Broadcom iProc host bridge driver:
Allow multiple devices except on PAXC (Ray Jui)
Renesas R-Car host bridge driver:
Add gen2 device tree support for r8a7793 (Simon Horman)
Add device tree support for r8a7793 (Simon Horman)"
* tag 'pci-v4.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
PCI: rcar: Add device tree support for r8a7793
PCI: rcar: Add gen2 device tree support for r8a7793
PCI: iproc: Allow multiple devices except on PAXC
PCI/AER: Flush workqueue on device remove to avoid use-after-free
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt | 1 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/pci/rcar-pci.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt b/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt index 4e8b90e43dd8..07a75094c5a8 100644 --- a/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt +++ b/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt | |||
@@ -8,6 +8,7 @@ OHCI and EHCI controllers. | |||
8 | Required properties: | 8 | Required properties: |
9 | - compatible: "renesas,pci-r8a7790" for the R8A7790 SoC; | 9 | - compatible: "renesas,pci-r8a7790" for the R8A7790 SoC; |
10 | "renesas,pci-r8a7791" for the R8A7791 SoC; | 10 | "renesas,pci-r8a7791" for the R8A7791 SoC; |
11 | "renesas,pci-r8a7793" for the R8A7793 SoC; | ||
11 | "renesas,pci-r8a7794" for the R8A7794 SoC; | 12 | "renesas,pci-r8a7794" for the R8A7794 SoC; |
12 | "renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device | 13 | "renesas,pci-rcar-gen2" for a generic R-Car Gen2 compatible device |
13 | 14 | ||
diff --git a/Documentation/devicetree/bindings/pci/rcar-pci.txt b/Documentation/devicetree/bindings/pci/rcar-pci.txt index 558fe528ae19..6cf99690eef9 100644 --- a/Documentation/devicetree/bindings/pci/rcar-pci.txt +++ b/Documentation/devicetree/bindings/pci/rcar-pci.txt | |||
@@ -4,6 +4,7 @@ Required properties: | |||
4 | compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC; | 4 | compatible: "renesas,pcie-r8a7779" for the R8A7779 SoC; |
5 | "renesas,pcie-r8a7790" for the R8A7790 SoC; | 5 | "renesas,pcie-r8a7790" for the R8A7790 SoC; |
6 | "renesas,pcie-r8a7791" for the R8A7791 SoC; | 6 | "renesas,pcie-r8a7791" for the R8A7791 SoC; |
7 | "renesas,pcie-r8a7793" for the R8A7793 SoC; | ||
7 | "renesas,pcie-r8a7795" for the R8A7795 SoC; | 8 | "renesas,pcie-r8a7795" for the R8A7795 SoC; |
8 | "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device. | 9 | "renesas,pcie-rcar-gen2" for a generic R-Car Gen2 compatible device. |
9 | 10 | ||