From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>, alsa-devel@alsa-project.org, Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>, Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>, Gregory Clement <gregory.clement@free-electrons.com> Cc: Lior Amsalem <alior@marvell.com>, Thomas Petazzoni <thomas.petazzoni@free-electrons.com>, Tawfik Bayouk <tawfik@marvell.com>, Nadav Haklai <nadavh@marvell.com>, Ezequiel Garcia <ezequiel.garcia@free-electrons.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/6] ARM: mvebu: use simple-card DT binding for audio on Armada 370 DB Date: Tue, 28 Oct 2014 17:08:43 +0100 [thread overview] Message-ID: <1414512524-24466-6-git-send-email-thomas.petazzoni@free-electrons.com> (raw) In-Reply-To: <1414512524-24466-1-git-send-email-thomas.petazzoni@free-electrons.com> This commit modifies the Armada 370 and Armada 370 DB Device Tree descriptions to use the simple-card DT binding to describe the audio complex of the Armada 370 DB instead of a custom audio machine driver. To do so, it: - Adds the sound-dai-cells properties to the CS42L51 node, the audio controller node and the SPDIF in/out nodes. - Completely changes the description of the sound complex to use the "simple-audio-card" DT binding instead of the "marvell,a370db-audio" DT binding. - Fixes the indentation to properly use tabs instead of spaces. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- arch/arm/boot/dts/armada-370-db.dts | 56 +++++++++++++++++++++++++++++++++---- arch/arm/boot/dts/armada-370.dtsi | 1 + 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index d505135..0b7bf5e 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts @@ -75,6 +75,7 @@ clock-frequency = <100000>; status = "okay"; audio_codec: audio-codec@4a { + #sound-dai-cells = <0>; compatible = "cirrus,cs42l51"; reg = <0x4a>; }; @@ -143,17 +144,60 @@ }; sound { - compatible = "marvell,a370db-audio"; - marvell,audio-controller = <&audio_controller>; - marvell,audio-codec = <&audio_codec &spdif_out &spdif_in>; - status = "okay"; + compatible = "simple-audio-card"; + simple-audio-card,name = "Armada 370 DB Audio"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,widgets = + "Headphone", "Out Jack", + "Line", "In Jack"; + simple-audio-card,routing = + "Out Jack", "HPL", + "Out Jack", "HPR", + "AIN1L", "In Jack", + "AIN1L", "In Jack"; + status = "okay"; + + simple-audio-card,dai-link@0 { + format = "i2s"; + cpu { + sound-dai = <&audio_controller 0>; + }; + + codec { + sound-dai = <&audio_codec>; + }; + }; + + simple-audio-card,dai-link@1 { + format = "i2s"; + cpu { + sound-dai = <&audio_controller 1>; + }; + + codec { + sound-dai = <&spdif_out>; + }; + }; + + simple-audio-card,dai-link@2 { + format = "i2s"; + cpu { + sound-dai = <&audio_controller 1>; + }; + + codec { + sound-dai = <&spdif_in>; + }; + }; }; spdif_out: spdif-out { - compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; }; spdif_in: spdif-in { - compatible = "linux,spdif-dir"; + #sound-dai-cells = <0>; + compatible = "linux,spdif-dir"; }; }; diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 6b3c23b..8d0c451 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -249,6 +249,7 @@ }; audio_controller: audio-controller@30000 { + #sound-dai-cells = <1>; compatible = "marvell,armada370-audio"; reg = <0x30000 0x4000>; interrupts = <93>; -- 2.0.0
WARNING: multiple messages have this Message-ID (diff)
From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/6] ARM: mvebu: use simple-card DT binding for audio on Armada 370 DB Date: Tue, 28 Oct 2014 17:08:43 +0100 [thread overview] Message-ID: <1414512524-24466-6-git-send-email-thomas.petazzoni@free-electrons.com> (raw) In-Reply-To: <1414512524-24466-1-git-send-email-thomas.petazzoni@free-electrons.com> This commit modifies the Armada 370 and Armada 370 DB Device Tree descriptions to use the simple-card DT binding to describe the audio complex of the Armada 370 DB instead of a custom audio machine driver. To do so, it: - Adds the sound-dai-cells properties to the CS42L51 node, the audio controller node and the SPDIF in/out nodes. - Completely changes the description of the sound complex to use the "simple-audio-card" DT binding instead of the "marvell,a370db-audio" DT binding. - Fixes the indentation to properly use tabs instead of spaces. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- arch/arm/boot/dts/armada-370-db.dts | 56 +++++++++++++++++++++++++++++++++---- arch/arm/boot/dts/armada-370.dtsi | 1 + 2 files changed, 51 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index d505135..0b7bf5e 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts @@ -75,6 +75,7 @@ clock-frequency = <100000>; status = "okay"; audio_codec: audio-codec at 4a { + #sound-dai-cells = <0>; compatible = "cirrus,cs42l51"; reg = <0x4a>; }; @@ -143,17 +144,60 @@ }; sound { - compatible = "marvell,a370db-audio"; - marvell,audio-controller = <&audio_controller>; - marvell,audio-codec = <&audio_codec &spdif_out &spdif_in>; - status = "okay"; + compatible = "simple-audio-card"; + simple-audio-card,name = "Armada 370 DB Audio"; + simple-audio-card,mclk-fs = <256>; + simple-audio-card,widgets = + "Headphone", "Out Jack", + "Line", "In Jack"; + simple-audio-card,routing = + "Out Jack", "HPL", + "Out Jack", "HPR", + "AIN1L", "In Jack", + "AIN1L", "In Jack"; + status = "okay"; + + simple-audio-card,dai-link at 0 { + format = "i2s"; + cpu { + sound-dai = <&audio_controller 0>; + }; + + codec { + sound-dai = <&audio_codec>; + }; + }; + + simple-audio-card,dai-link at 1 { + format = "i2s"; + cpu { + sound-dai = <&audio_controller 1>; + }; + + codec { + sound-dai = <&spdif_out>; + }; + }; + + simple-audio-card,dai-link at 2 { + format = "i2s"; + cpu { + sound-dai = <&audio_controller 1>; + }; + + codec { + sound-dai = <&spdif_in>; + }; + }; }; spdif_out: spdif-out { - compatible = "linux,spdif-dit"; + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; }; spdif_in: spdif-in { - compatible = "linux,spdif-dir"; + #sound-dai-cells = <0>; + compatible = "linux,spdif-dir"; }; }; diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 6b3c23b..8d0c451 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -249,6 +249,7 @@ }; audio_controller: audio-controller at 30000 { + #sound-dai-cells = <1>; compatible = "marvell,armada370-audio"; reg = <0x30000 0x4000>; interrupts = <93>; -- 2.0.0
next prev parent reply other threads:[~2014-10-28 16:08 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-10-28 16:08 [PATCH 0/6] ASoC/ARM: move Marvell Armada 370 DB to simple-audio-card Thomas Petazzoni 2014-10-28 16:08 ` Thomas Petazzoni 2014-10-28 16:08 ` [PATCH 1/6] ASoC: cs42l51: re-add of_match_table pointer Thomas Petazzoni 2014-10-28 16:08 ` Thomas Petazzoni 2014-10-28 20:09 ` Brian Austin 2014-10-28 20:09 ` Brian Austin 2014-10-28 16:08 ` [PATCH 2/6] ASoC: cs42l51: make driver user-selectable Thomas Petazzoni 2014-10-28 16:08 ` Thomas Petazzoni 2014-10-28 19:50 ` Brian Austin 2014-10-28 19:50 ` Brian Austin 2014-10-28 22:34 ` Mark Brown 2014-10-28 22:34 ` Mark Brown 2014-10-28 16:08 ` [PATCH 3/6] ASoC: kirkwood: get rid of armada-370-db driver Thomas Petazzoni 2014-10-28 16:08 ` Thomas Petazzoni 2014-10-28 22:35 ` Mark Brown 2014-10-28 22:35 ` Mark Brown 2014-10-28 22:54 ` Thomas Petazzoni 2014-10-28 22:54 ` Thomas Petazzoni 2014-10-28 23:07 ` Mark Brown 2014-10-28 23:07 ` Mark Brown 2014-10-29 8:24 ` Thomas Petazzoni 2014-10-29 8:24 ` Thomas Petazzoni 2014-10-29 10:56 ` Mark Brown 2014-10-29 10:56 ` Mark Brown 2014-10-28 16:08 ` [PATCH 4/6] ARM: mvebu: remove conflicting muxing on Armada 370 DB Thomas Petazzoni 2014-10-28 16:08 ` Thomas Petazzoni 2014-11-07 3:15 ` Jason Cooper 2014-11-07 3:15 ` Jason Cooper 2014-12-18 18:13 ` Gregory CLEMENT 2014-12-18 18:13 ` Gregory CLEMENT 2014-10-28 16:08 ` Thomas Petazzoni [this message] 2014-10-28 16:08 ` [PATCH 5/6] ARM: mvebu: use simple-card DT binding for audio " Thomas Petazzoni 2014-10-28 16:08 ` [PATCH 6/6] ARM: mvebu: update mvebu_v7_defconfig for Armada 370 audio Thomas Petazzoni 2014-10-28 16:08 ` Thomas Petazzoni 2014-11-07 3:17 ` Jason Cooper 2014-11-07 3:17 ` Jason Cooper 2014-10-28 16:23 ` [PATCH 0/6] ASoC/ARM: move Marvell Armada 370 DB to simple-audio-card Andrew Lunn 2014-10-28 16:23 ` Andrew Lunn
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1414512524-24466-6-git-send-email-thomas.petazzoni@free-electrons.com \ --to=thomas.petazzoni@free-electrons.com \ --cc=alior@marvell.com \ --cc=alsa-devel@alsa-project.org \ --cc=andrew@lunn.ch \ --cc=broonie@kernel.org \ --cc=ezequiel.garcia@free-electrons.com \ --cc=gregory.clement@free-electrons.com \ --cc=jason@lakedaemon.net \ --cc=lgirdwood@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=nadavh@marvell.com \ --cc=sebastian.hesselbarth@gmail.com \ --cc=tawfik@marvell.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.