The patch ASoC: meson: update axg sound card bindings has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From d9e81048127604fe6373fb76181fefcf218965f4 Mon Sep 17 00:00:00 2001 From: Jerome Brunet <jbrunet@xxxxxxxxxxxx> Date: Thu, 26 Jul 2018 14:45:43 +0200 Subject: [PATCH] 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: Rob Herring <robh@xxxxxxxxxx> Signed-off-by: Jerome Brunet <jbrunet@xxxxxxxxxxxx> Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> --- .../bindings/sound/amlogic,axg-sound-card.txt | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt b/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt index 39e005da0407..80b411296480 100644 --- a/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt +++ b/Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.txt @@ -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,38 +57,38 @@ Example: sound { compatible = "amlogic,axg-sound-card"; - amlogic,name = "AXG-S420"; - amlogic,aux-devs = <&tdmin_a>, <&tdmout_c>; - amlogic,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", - "SPDIFOUT IN 0", "FRDDR_A OUT 3", - "TDM_C Playback", "TDMOUT_C OUT", - "TDMIN_A IN 2", "TDM_C Capture", - "TDMIN_A IN 5", "TDM_C Loopback", - "TODDR_A IN 0", "TDMIN_A OUT", - "Lineout", "Lineout AOUTL", - "Lineout", "Lineout AOUTR", - "Speaker1 Left", "SPK1 OUT_A", - "Speaker2 Left", "SPK2 OUT_A", - "Speaker1 Right", "SPK1 OUT_B", - "Speaker2 Right", "SPK2 OUT_B", - "Linein AINL", "Linein", - "Linein AINR", "Linein"; - - amlogic,dai-link@0 { + 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"; + 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", + "TDMIN_A IN 5", "TDM_C Loopback", + "TODDR_A IN 0", "TDMIN_A OUT", + "Lineout", "Lineout AOUTL", + "Lineout", "Lineout AOUTR", + "Speaker1 Left", "SPK1 OUT_A", + "Speaker2 Left", "SPK2 OUT_A", + "Speaker1 Right", "SPK1 OUT_B", + "Speaker2 Right", "SPK2 OUT_B", + "Linein AINL", "Linein", + "Linein AINR", "Linein"; + + 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 { -- 2.18.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
