aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiubo Li <Li.Xiubo@freescale.com>2014-02-08 02:59:55 -0500
committerMark Brown <broonie@linaro.org>2014-02-10 08:33:50 -0500
commit66841345073b049c0c194486bac4d7f07266a57e (patch)
tree09e9e2c9008705b34d22837be665a3626f524ca2
parent9d681f5bfc85515a7b4a4af09337ed5e74f39ad9 (diff)
ASoC: simple-card: for new properties documenting and usage
This add the following three new properties documenting and usage for simple card: "simple-audio-card,name", "simple-audio-card,widgets", Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--Documentation/devicetree/bindings/sound/simple-card.txt12
1 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt b/Documentation/devicetree/bindings/sound/simple-card.txt
index 19c84df5fffa..05273583490c 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -8,9 +8,12 @@ Required properties:
8 8
9Optional properties: 9Optional properties:
10 10
11- simple-audio-card,name : User specified audio sound card name, one string
12 property.
11- simple-audio-card,format : CPU/CODEC common audio format. 13- simple-audio-card,format : CPU/CODEC common audio format.
12 "i2s", "right_j", "left_j" , "dsp_a" 14 "i2s", "right_j", "left_j" , "dsp_a"
13 "dsp_b", "ac97", "pdm", "msb", "lsb" 15 "dsp_b", "ac97", "pdm", "msb", "lsb"
16- simple-audio-card,widgets : Please refer to widgets.txt.
14- simple-audio-card,routing : A list of the connections between audio components. 17- simple-audio-card,routing : A list of the connections between audio components.
15 Each entry is a pair of strings, the first being the 18 Each entry is a pair of strings, the first being the
16 connection's sink, the second being the connection's 19 connection's sink, the second being the connection's
@@ -42,11 +45,16 @@ Example:
42 45
43sound { 46sound {
44 compatible = "simple-audio-card"; 47 compatible = "simple-audio-card";
48 simple-audio-card,name = "VF610-Tower-Sound-Card";
45 simple-audio-card,format = "left_j"; 49 simple-audio-card,format = "left_j";
50 simple-audio-card,widgets =
51 "Microphone", "Microphone Jack",
52 "Headphone", "Headphone Jack",
53 "Speaker", "External Speaker";
46 simple-audio-card,routing = 54 simple-audio-card,routing =
47 "MIC_IN", "Mic Jack", 55 "MIC_IN", "Microphone Jack",
48 "Headphone Jack", "HP_OUT", 56 "Headphone Jack", "HP_OUT",
49 "Ext Spk", "LINE_OUT"; 57 "External Speaker", "LINE_OUT";
50 58
51 simple-audio-card,cpu { 59 simple-audio-card,cpu {
52 sound-dai = <&sh_fsi2 0>; 60 sound-dai = <&sh_fsi2 0>;