Commit d9e81048 authored by Jerome Brunet's avatar Jerome Brunet Committed by Mark Brown

ASoC: meson: update axg sound card bindings

Remove the amlogic prefix in front of the generic properties and change
the card 'name' property to 'model'
Suggested-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 036e4963
...@@ -3,19 +3,19 @@ Amlogic AXG sound card: ...@@ -3,19 +3,19 @@ Amlogic AXG sound card:
Required properties: Required properties:
- compatible: "amlogic,axg-sound-card" - compatible: "amlogic,axg-sound-card"
- amlogic,name : User specified audio sound card name, one string - model : User specified audio sound card name, one string
Optional properties: Optional properties:
- amlogic,aux-devs : List of phandles pointing to auxiliary devices - audio-aux-devs : List of phandles pointing to auxiliary devices
- amlogic,widgets : Please refer to widgets.txt. - audio-widgets : Please refer to widgets.txt.
- amlogic,routing : A list of the connections between audio components. - audio-routing : A list of the connections between audio components.
Subnodes: Subnodes:
- amlogic,dai-link: Container for dai-link level properties and the - dai-link: Container for dai-link level properties and the CODEC
CODEC sub-nodes. There should be at least one (and sub-nodes. There should be at least one (and probably more)
probably) subnode of this type. subnode of this type.
Required dai-link properties: Required dai-link properties:
...@@ -57,38 +57,38 @@ Example: ...@@ -57,38 +57,38 @@ Example:
sound { sound {
compatible = "amlogic,axg-sound-card"; compatible = "amlogic,axg-sound-card";
amlogic,name = "AXG-S420"; model = "AXG-S420";
amlogic,aux-devs = <&tdmin_a>, <&tdmout_c>; audio-aux-devs = <&tdmin_a>, <&tdmout_c>;
amlogic,widgets = "Line", "Lineout", audio-widgets = "Line", "Lineout",
"Line", "Linein", "Line", "Linein",
"Speaker", "Speaker1 Left", "Speaker", "Speaker1 Left",
"Speaker", "Speaker1 Right"; "Speaker", "Speaker1 Right";
"Speaker", "Speaker2 Left", "Speaker", "Speaker2 Left",
"Speaker", "Speaker2 Right"; "Speaker", "Speaker2 Right";
amlogic,routing = "TDMOUT_C IN 0", "FRDDR_A OUT 2", audio-routing = "TDMOUT_C IN 0", "FRDDR_A OUT 2",
"SPDIFOUT IN 0", "FRDDR_A OUT 3", "SPDIFOUT IN 0", "FRDDR_A OUT 3",
"TDM_C Playback", "TDMOUT_C OUT", "TDM_C Playback", "TDMOUT_C OUT",
"TDMIN_A IN 2", "TDM_C Capture", "TDMIN_A IN 2", "TDM_C Capture",
"TDMIN_A IN 5", "TDM_C Loopback", "TDMIN_A IN 5", "TDM_C Loopback",
"TODDR_A IN 0", "TDMIN_A OUT", "TODDR_A IN 0", "TDMIN_A OUT",
"Lineout", "Lineout AOUTL", "Lineout", "Lineout AOUTL",
"Lineout", "Lineout AOUTR", "Lineout", "Lineout AOUTR",
"Speaker1 Left", "SPK1 OUT_A", "Speaker1 Left", "SPK1 OUT_A",
"Speaker2 Left", "SPK2 OUT_A", "Speaker2 Left", "SPK2 OUT_A",
"Speaker1 Right", "SPK1 OUT_B", "Speaker1 Right", "SPK1 OUT_B",
"Speaker2 Right", "SPK2 OUT_B", "Speaker2 Right", "SPK2 OUT_B",
"Linein AINL", "Linein", "Linein AINL", "Linein",
"Linein AINR", "Linein"; "Linein AINR", "Linein";
amlogic,dai-link@0 { dai-link@0 {
sound-dai = <&frddr_a>; sound-dai = <&frddr_a>;
}; };
amlogic,dai-link@1 { dai-link@1 {
sound-dai = <&toddr_a>; sound-dai = <&toddr_a>;
}; };
amlogic,dai-link@2 { dai-link@2 {
sound-dai = <&tdmif_c>; sound-dai = <&tdmif_c>;
dai-format = "i2s"; dai-format = "i2s";
dai-tdm-slot-tx-mask-2 = <1 1>; dai-tdm-slot-tx-mask-2 = <1 1>;
...@@ -114,7 +114,7 @@ sound { ...@@ -114,7 +114,7 @@ sound {
}; };
amlogic,dai-link@4 { dai-link@3 {
sound-dai = <&spdifout>; sound-dai = <&spdifout>;
codec { codec {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment