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 <[email protected]>
---
 Documentation/devicetree/bindings/sound/simple-card.txt | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/sound/simple-card.txt 
b/Documentation/devicetree/bindings/sound/simple-card.txt
index 19c84df..0527358 100644
--- a/Documentation/devicetree/bindings/sound/simple-card.txt
+++ b/Documentation/devicetree/bindings/sound/simple-card.txt
@@ -8,9 +8,12 @@ Required properties:
 
 Optional properties:
 
+- simple-audio-card,name               : User specified audio sound card name, 
one string
+                                         property.
 - simple-audio-card,format             : CPU/CODEC common audio format.
                                          "i2s", "right_j", "left_j" , "dsp_a"
                                          "dsp_b", "ac97", "pdm", "msb", "lsb"
+- simple-audio-card,widgets            : Please refer to widgets.txt.
 - simple-audio-card,routing            : A list of the connections between 
audio components.
                                          Each entry is a pair of strings, the 
first being the
                                          connection's sink, the second being 
the connection's
@@ -42,11 +45,16 @@ Example:
 
 sound {
        compatible = "simple-audio-card";
+       simple-audio-card,name = "VF610-Tower-Sound-Card";
        simple-audio-card,format = "left_j";
+       simple-audio-card,widgets =
+               "Microphone", "Microphone Jack",
+               "Headphone", "Headphone Jack",
+               "Speaker", "External Speaker";
        simple-audio-card,routing =
-               "MIC_IN", "Mic Jack",
+               "MIC_IN", "Microphone Jack",
                "Headphone Jack", "HP_OUT",
-               "Ext Spk", "LINE_OUT";
+               "External Speaker", "LINE_OUT";
 
        simple-audio-card,cpu {
                sound-dai = <&sh_fsi2 0>;
-- 
1.8.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to