diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-10-06 11:56:54 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-10-06 11:56:54 +0300 |
| commit | 38a413cbc2b2834683b21823d964bc2d2f0abb82 (patch) | |
| tree | 2c62753bef5068ca9a34f13beee142304d028ec0 /Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt | |
| parent | 55696b1f664e52b3036f21631f9c2247b667f587 (diff) | |
| parent | 9ffecb10283508260936b96022d4ee43a7798b4c (diff) | |
| download | linux-38a413cbc2b2834683b21823d964bc2d2f0abb82.tar.xz | |
Merge tag 'v4.3-rc3' into x86/mm, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt b/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt index d8ef5bf50f11..7fab84b33531 100644 --- a/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt +++ b/Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt @@ -7,7 +7,8 @@ OHCI and EHCI controllers. Required properties: - compatible: "renesas,pci-r8a7790" for the R8A7790 SoC; - "renesas,pci-r8a7791" for the R8A7791 SoC. + "renesas,pci-r8a7791" for the R8A7791 SoC; + "renesas,pci-r8a7794" for the R8A7794 SoC. - reg: A list of physical regions to access the device: the first is the operational registers for the OHCI/EHCI controllers and the second is for the bridge configuration and control registers. |