Merge remote-tracking branches 'asoc/topic/wm9712', 'asoc/topic/wm9713' and 'asoc...

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / sound / qcom,apq8016-sbc.txt

diff --git a/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
index d9d8635ff94ce65faa0f3a5f14333266145f189a..6a4aadc4ce06b27ff059c64f6c438d0fef863b21 100644 (file)
--- a/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
+++ b/Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt
@@ -44,8 +44,7 @@ Required dai-link subnodes:
 Required CPU/CODEC subnodes properties:
 
 -link-name             : Name of the dai link.
--sound-dai             : phandle and port of CPU/CODEC
--capture-dai           : phandle and port of CPU/CODEC
+-sound-dai             : phandle/s and port of CPU/CODEC
 
 Example:
 
@@ -73,7 +72,7 @@ sound: sound {
                        sound-dai = <&lpass MI2S_PRIMARY>;
                };
                codec {
-                       sound-dai = <&wcd_codec 0>;
+                       sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
                };
        };