Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt

+34 −34
Original line number Diff line number Diff line
@@ -3,19 +3,19 @@ Amlogic AXG sound card: 
Required properties:



- 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:



- amlogic,aux-devs : List of phandles pointing to auxiliary devices

- amlogic,widgets : Please refer to widgets.txt.

- amlogic,routing : A list of the connections between audio components.

- audio-aux-devs : List of phandles pointing to auxiliary devices

- audio-widgets : Please refer to widgets.txt.

- audio-routing : A list of the connections between audio components.



Subnodes:



- amlogic,dai-link: Container for dai-link level properties and the

		    CODEC sub-nodes. There should be at least one (and

		    probably) subnode of this type.

- dai-link: Container for dai-link level properties and the CODEC

	    sub-nodes. There should be at least one (and probably more)

	    subnode of this type.



Required dai-link properties:
@@ -57,15 +57,15 @@ Example: 


sound {

	compatible = "amlogic,axg-sound-card";

	amlogic,name = "AXG-S420";

	amlogic,aux-devs = <&tdmin_a>, <&tdmout_c>;

	amlogic,widgets = "Line", "Lineout",

	model = "AXG-S420";

	audio-aux-devs = <&tdmin_a>, <&tdmout_c>;

	audio-widgets = "Line", "Lineout",

			"Line", "Linein",

			"Speaker", "Speaker1 Left",

			"Speaker", "Speaker1 Right";

			"Speaker", "Speaker2 Left",

			"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",

			"TDM_C Playback", "TDMOUT_C OUT",

			"TDMIN_A IN 2", "TDM_C Capture",
@@ -80,15 +80,15 @@ sound { 
			"Linein AINL", "Linein",

			"Linein AINR", "Linein";



	amlogic,dai-link@0 {

	dai-link@0 {

		sound-dai = <&frddr_a>;

	};



	amlogic,dai-link@1 {

	dai-link@1 {

		sound-dai = <&toddr_a>;

	};



	amlogic,dai-link@2 {

	dai-link@2 {

		sound-dai = <&tdmif_c>;

		dai-format = "i2s";

		dai-tdm-slot-tx-mask-2 = <1 1>;
@@ -114,7 +114,7 @@ sound { 


	};



	amlogic,dai-link@4 {

	dai-link@3 {

		sound-dai = <&spdifout>;



		codec {