Merge branch 'topic/sh' into for-linus

1 files changed, 0 insertions, 29 deletions

diff --git a/Documentation/devicetree/bindings/dma/rcar-audmapp.txt b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
deleted file mode 100644
index 61bca509d7b9..000000000000
--- a/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-* R-Car Audio DMAC peri peri Device Tree bindings
-
-Required properties:
-- compatible:   should be "renesas,rcar-audmapp"
-- #dma-cells:   should be <1>, see "dmas" property below
-
-Example:
-        audmapp: audio-dma-pp@0xec740000 {
-                compatible = "renesas,rcar-audmapp";
-                #dma-cells = <1>;
-
-                reg = <0 0xec740000 0 0x200>;
-        };
-
-
-* DMA client
-
-Required properties:
-- dmas:         a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.
-                where SRS/DRS are specified in the SoC manual.
-                It will be written into PDMACHCR as high 16-bit parts.
-- dma-names:    a list of DMA channel names, one per "dmas" entry
-
-Example:
-
-        dmas = <&audmapp 0x2d00
-                &audmapp 0x3700>;
-        dma-names =  "src0_ssiu0",
-                     "dvc0_ssiu0";