aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-10 21:30:57 +0000
committerMark Brown <broonie@kernel.org>2017-11-10 21:30:57 +0000
commitf904f84609b679c4bd056095a8d778bb40a049cb (patch)
tree8a3ff7acd944e928b79a807a516091eb9e4f320e /Documentation/devicetree/bindings/sound
parentMerge remote-tracking branch 'asoc/topic/qcom' into asoc-next (diff)
parentASoC: rsnd: return -EIO if rsnd_dmaen_request_channel() failed (diff)
downloadlinux-dev-f904f84609b679c4bd056095a8d778bb40a049cb.tar.xz
linux-dev-f904f84609b679c4bd056095a8d778bb40a049cb.zip
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'Documentation/devicetree/bindings/sound')
-rw-r--r--Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt b/Documentation/devicetree/bindings/sound/audio-graph-scu-card.txt
index 8b8afe9fcb31..441dd6f29df1 100644
--- 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