diff options
author | Vinod Koul <vkoul@kernel.org> | 2018-10-24 09:16:22 +0100 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2018-10-24 09:16:22 +0100 |
commit | 8e75ab9bd835bd29bc9f3a587d8e2799009d301a (patch) | |
tree | 81feae1e2ac199cffc572bc2594f4a50e0c23c4d /Documentation/devicetree | |
parent | bfda9020870824c497c674901142f836c199dde9 (diff) | |
parent | 97d49c59e219acac576e16293a6b8cb99302f62f (diff) | |
download | linux-stable-8e75ab9bd835bd29bc9f3a587d8e2799009d301a.tar.gz linux-stable-8e75ab9bd835bd29bc9f3a587d8e2799009d301a.tar.bz2 linux-stable-8e75ab9bd835bd29bc9f3a587d8e2799009d301a.zip |
Merge branch 'topic/renesas' into for-linus
Diffstat (limited to 'Documentation/devicetree')
-rw-r--r-- | Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt index 946229c48657..a5a7c3f5a1e3 100644 --- a/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt +++ b/Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt @@ -17,6 +17,7 @@ Required Properties: - compatible: "renesas,dmac-<soctype>", "renesas,rcar-dmac" as fallback. Examples with soctypes are: - "renesas,dmac-r8a7743" (RZ/G1M) + - "renesas,dmac-r8a7744" (RZ/G1N) - "renesas,dmac-r8a7745" (RZ/G1E) - "renesas,dmac-r8a77470" (RZ/G1C) - "renesas,dmac-r8a7790" (R-Car H2) diff --git a/Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt b/Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt index 482e54362d3e..1743017bd948 100644 --- a/Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt +++ b/Documentation/devicetree/bindings/dma/renesas,usb-dmac.txt @@ -4,6 +4,7 @@ Required Properties: -compatible: "renesas,<soctype>-usb-dmac", "renesas,usb-dmac" as fallback. Examples with soctypes are: - "renesas,r8a7743-usb-dmac" (RZ/G1M) + - "renesas,r8a7744-usb-dmac" (RZ/G1N) - "renesas,r8a7745-usb-dmac" (RZ/G1E) - "renesas,r8a7790-usb-dmac" (R-Car H2) - "renesas,r8a7791-usb-dmac" (R-Car M2-W) |