Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / sound / audio-graph-scu-card.txt

diff --git a/Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt b/Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
index 8b8afe9fcb315891b0e321152bbf56eefd5c6e30..441dd6f29df13ba987316c5b6a4102c7bf73e636 100644 (file)
--- a/Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
+++ b/Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
@@ -43,7 +43,7 @@ Example 1. Sampling Rate Conversion
                label = "sound-card";
                prefix = "codec";
                routing = "codec Playback", "DAI0 Playback",
-                       "codec Playback", "DAI1 Playback";
+                         "DAI0 Capture",   "codec Capture";
                convert-rate = <48000>;
 
                dais = <&cpu_port>;
@@ -79,7 +79,8 @@ Example 2. 2 CPU 1 Codec (Mixing)
                label = "sound-card";
                prefix = "codec";
                routing = "codec Playback", "DAI0 Playback",
-                       "codec Playback", "DAI1 Playback";
+                         "codec Playback", "DAI1 Playback",
+                         "DAI0 Capture",   "codec Capture";
                convert-rate = <48000>;
 
                dais = <&cpu_port0