* [PATCH v3 0/5] ASoC: sun8i-a33 clean-up for 4.11 @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: alsa-devel, linux-arm-kernel, linux-kernel, devicetree, thomas.petazzoni, alexandre.belloni, Mylène Josserand Hi everyone, As discussed in this thread [1], here are a V3 of the cleanup series for the sun8i-a33 driver (introduced in v4.11-rc1) as fixes for v4.11. Based on: Linus repository - master branch Last commit: 8841b5f0cd ("Merge tag 'nfs-for-4.11-2' of git://git.linux-nfs.org/projects/anna/linux-nfs") Changes since v1 and v2: - Patch 01: No changes from v1, it applies directly - Patch 02: No changes from v1, it applies directly once patch 01 has been applied. - Patch 03: No changes from v2, it applies directly - Patch 04: Rebased on master branch - Patch 05: No changes from v2, it applies directly Patch 01 removes some unnecessary widgets. Patch 02 updates the driver to use SOC_DAPM_DOUBLE. Patch 03 removes a space on a widget name that implies an error on audio routing as the widget is unknown. Patch 04 improves some widgets (names and types). As widget names changed in patch 04, the patch 05 is needed to use the same names on audio routing. Otherwise, the device tree for sun8i-a33 will be broken and the audio codec will not work. Only patches 01 and 02 were initially wanted as fixes for v4.11 but, with Chen-Yu, we thought that patch 03 and 04 could be also applied as fixes. As patch 04 creates a break with the device tree, I added patch 05 in this series. Let me know what you think. [1]: https://lkml.org/lkml/2017/3/14/4 Thank you in advance, Best regards, Mylène Josserand (5): ASoC: sun8i-codec: Remove analog "HP" widget ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE ASoC: sun8i-codec: Fix space on audio-routing widget ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN ARM: dts: sun8i: Update audio-routing with renamed widgets arch/arm/boot/dts/sun8i-a33.dtsi | 4 +-- sound/soc/sunxi/sun8i-codec.c | 67 ++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 39 deletions(-) -- 2.11.0 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 0/5] ASoC: sun8i-a33 clean-up for 4.11 @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: linux-arm-kernel Hi everyone, As discussed in this thread [1], here are a V3 of the cleanup series for the sun8i-a33 driver (introduced in v4.11-rc1) as fixes for v4.11. Based on: Linus repository - master branch Last commit: 8841b5f0cd ("Merge tag 'nfs-for-4.11-2' of git://git.linux-nfs.org/projects/anna/linux-nfs") Changes since v1 and v2: - Patch 01: No changes from v1, it applies directly - Patch 02: No changes from v1, it applies directly once patch 01 has been applied. - Patch 03: No changes from v2, it applies directly - Patch 04: Rebased on master branch - Patch 05: No changes from v2, it applies directly Patch 01 removes some unnecessary widgets. Patch 02 updates the driver to use SOC_DAPM_DOUBLE. Patch 03 removes a space on a widget name that implies an error on audio routing as the widget is unknown. Patch 04 improves some widgets (names and types). As widget names changed in patch 04, the patch 05 is needed to use the same names on audio routing. Otherwise, the device tree for sun8i-a33 will be broken and the audio codec will not work. Only patches 01 and 02 were initially wanted as fixes for v4.11 but, with Chen-Yu, we thought that patch 03 and 04 could be also applied as fixes. As patch 04 creates a break with the device tree, I added patch 05 in this series. Let me know what you think. [1]: https://lkml.org/lkml/2017/3/14/4 Thank you in advance, Best regards, Myl?ne Josserand (5): ASoC: sun8i-codec: Remove analog "HP" widget ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE ASoC: sun8i-codec: Fix space on audio-routing widget ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN ARM: dts: sun8i: Update audio-routing with renamed widgets arch/arm/boot/dts/sun8i-a33.dtsi | 4 +-- sound/soc/sunxi/sun8i-codec.c | 67 ++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 39 deletions(-) -- 2.11.0 ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 0/5] ASoC: sun8i-a33 clean-up for 4.11 @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel, alexandre.belloni, Mylène Josserand, linux-arm-kernel Hi everyone, As discussed in this thread [1], here are a V3 of the cleanup series for the sun8i-a33 driver (introduced in v4.11-rc1) as fixes for v4.11. Based on: Linus repository - master branch Last commit: 8841b5f0cd ("Merge tag 'nfs-for-4.11-2' of git://git.linux-nfs.org/projects/anna/linux-nfs") Changes since v1 and v2: - Patch 01: No changes from v1, it applies directly - Patch 02: No changes from v1, it applies directly once patch 01 has been applied. - Patch 03: No changes from v2, it applies directly - Patch 04: Rebased on master branch - Patch 05: No changes from v2, it applies directly Patch 01 removes some unnecessary widgets. Patch 02 updates the driver to use SOC_DAPM_DOUBLE. Patch 03 removes a space on a widget name that implies an error on audio routing as the widget is unknown. Patch 04 improves some widgets (names and types). As widget names changed in patch 04, the patch 05 is needed to use the same names on audio routing. Otherwise, the device tree for sun8i-a33 will be broken and the audio codec will not work. Only patches 01 and 02 were initially wanted as fixes for v4.11 but, with Chen-Yu, we thought that patch 03 and 04 could be also applied as fixes. As patch 04 creates a break with the device tree, I added patch 05 in this series. Let me know what you think. [1]: https://lkml.org/lkml/2017/3/14/4 Thank you in advance, Best regards, Mylène Josserand (5): ASoC: sun8i-codec: Remove analog "HP" widget ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE ASoC: sun8i-codec: Fix space on audio-routing widget ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN ARM: dts: sun8i: Update audio-routing with renamed widgets arch/arm/boot/dts/sun8i-a33.dtsi | 4 +-- sound/soc/sunxi/sun8i-codec.c | 67 ++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 39 deletions(-) -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-18 7:55 ` Mylène Josserand -1 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: alsa-devel, linux-arm-kernel, linux-kernel, devicetree, thomas.petazzoni, alexandre.belloni, Mylène Josserand The "HP" widget is already present and take part to the analog part (sun8i-codec-analog). Remove it from the digital part as it is unnecessary. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index b92bdc8361af..d60f6fbd36a2 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -321,8 +321,6 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SUN8I_MOD_RST_CTL_AIF1, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("RST DAC", SUN8I_MOD_RST_CTL, SUN8I_MOD_RST_CTL_DAC, 0, NULL, 0), - - SND_SOC_DAPM_OUTPUT("HP"), }; static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { @@ -344,10 +342,6 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { /* DAC Mixer Routes */ { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, - - /* End of route : HP out */ - { "HP", NULL, "Left DAC Mixer" }, - { "HP", NULL, "Right DAC Mixer" }, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: linux-arm-kernel The "HP" widget is already present and take part to the analog part (sun8i-codec-analog). Remove it from the digital part as it is unnecessary. Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index b92bdc8361af..d60f6fbd36a2 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -321,8 +321,6 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SUN8I_MOD_RST_CTL_AIF1, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("RST DAC", SUN8I_MOD_RST_CTL, SUN8I_MOD_RST_CTL_DAC, 0, NULL, 0), - - SND_SOC_DAPM_OUTPUT("HP"), }; static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { @@ -344,10 +342,6 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { /* DAC Mixer Routes */ { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, - - /* End of route : HP out */ - { "HP", NULL, "Left DAC Mixer" }, - { "HP", NULL, "Right DAC Mixer" }, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel, alexandre.belloni, Mylène Josserand, linux-arm-kernel The "HP" widget is already present and take part to the analog part (sun8i-codec-analog). Remove it from the digital part as it is unnecessary. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index b92bdc8361af..d60f6fbd36a2 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -321,8 +321,6 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SUN8I_MOD_RST_CTL_AIF1, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("RST DAC", SUN8I_MOD_RST_CTL, SUN8I_MOD_RST_CTL_DAC, 0, NULL, 0), - - SND_SOC_DAPM_OUTPUT("HP"), }; static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { @@ -344,10 +342,6 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { /* DAC Mixer Routes */ { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, - - /* End of route : HP out */ - { "HP", NULL, "Left DAC Mixer" }, - { "HP", NULL, "Right DAC Mixer" }, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply related [flat|nested] 52+ messages in thread
* Re: [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-20 11:45 ` Chen-Yu Tsai -1 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:45 UTC (permalink / raw) To: Mylène Josserand Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Linux-ALSA, linux-arm-kernel, linux-kernel, devicetree, Thomas Petazzoni, Alexandre Belloni On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand <mylene.josserand@free-electrons.com> wrote: > The "HP" widget is already present and take part to > the analog part (sun8i-codec-analog). > > Remove it from the digital part as it is unnecessary. > > Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget @ 2017-03-20 11:45 ` Chen-Yu Tsai 0 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:45 UTC (permalink / raw) To: linux-arm-kernel On Sat, Mar 18, 2017 at 3:55 PM, Myl?ne Josserand <mylene.josserand@free-electrons.com> wrote: > The "HP" widget is already present and take part to > the analog part (sun8i-codec-analog). > > Remove it from the digital part as it is unnecessary. > > Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget @ 2017-03-20 11:45 ` Chen-Yu Tsai 0 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:45 UTC (permalink / raw) To: Mylène Josserand Cc: Mark Rutland, devicetree, Linux-ALSA, linux-kernel, Takashi Iwai, Rob Herring, Liam Girdwood, Chen-Yu Tsai, Mark Brown, Alexandre Belloni, Maxime Ripard, Thomas Petazzoni, linux-arm-kernel On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand <mylene.josserand@free-electrons.com> wrote: > The "HP" widget is already present and take part to > the analog part (sun8i-codec-analog). > > Remove it from the digital part as it is unnecessary. > > Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-20 17:39 ` Mark Brown -1 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-20 17:39 UTC (permalink / raw) To: Mylène Josserand Cc: lgirdwood, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland, alsa-devel, linux-arm-kernel, linux-kernel, devicetree, thomas.petazzoni, alexandre.belloni [-- Attachment #1: Type: text/plain, Size: 431 bytes --] On Sat, Mar 18, 2017 at 08:55:05AM +0100, Mylène Josserand wrote: > The "HP" widget is already present and take part to > the analog part (sun8i-codec-analog). > > Remove it from the digital part as it is unnecessary. I know I said to send against Linus' tree but it turns out this actually conflicts with some of the existing fixes, please see my fixes/sunxi branch and resend against that. Sorry for the hassle here. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget @ 2017-03-20 17:39 ` Mark Brown 0 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-20 17:39 UTC (permalink / raw) To: linux-arm-kernel On Sat, Mar 18, 2017 at 08:55:05AM +0100, Myl?ne Josserand wrote: > The "HP" widget is already present and take part to > the analog part (sun8i-codec-analog). > > Remove it from the digital part as it is unnecessary. I know I said to send against Linus' tree but it turns out this actually conflicts with some of the existing fixes, please see my fixes/sunxi branch and resend against that. Sorry for the hassle here. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170320/ed7e6790/attachment.sig> ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget @ 2017-03-20 17:39 ` Mark Brown 0 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-20 17:39 UTC (permalink / raw) To: Mylène Josserand Cc: mark.rutland, devicetree, alsa-devel, linux-kernel, tiwai, lgirdwood, wens, robh+dt, alexandre.belloni, maxime.ripard, thomas.petazzoni, linux-arm-kernel [-- Attachment #1.1: Type: text/plain, Size: 431 bytes --] On Sat, Mar 18, 2017 at 08:55:05AM +0100, Mylène Josserand wrote: > The "HP" widget is already present and take part to > the analog part (sun8i-codec-analog). > > Remove it from the digital part as it is unnecessary. I know I said to send against Linus' tree but it turns out this actually conflicts with some of the existing fixes, please see my fixes/sunxi branch and resend against that. Sorry for the hassle here. [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget 2017-03-20 17:39 ` Mark Brown (?) @ 2017-03-21 7:42 ` Mylene Josserand -1 siblings, 0 replies; 52+ messages in thread From: Mylene Josserand @ 2017-03-21 7:42 UTC (permalink / raw) To: Mark Brown Cc: lgirdwood, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland, alsa-devel, linux-arm-kernel, linux-kernel, devicetree, thomas.petazzoni, alexandre.belloni Hi Mark, On 20/03/2017 18:39, Mark Brown wrote: > On Sat, Mar 18, 2017 at 08:55:05AM +0100, Mylène Josserand wrote: >> The "HP" widget is already present and take part to >> the analog part (sun8i-codec-analog). >> >> Remove it from the digital part as it is unnecessary. > > I know I said to send against Linus' tree but it turns out this actually > conflicts with some of the existing fixes, please see my fixes/sunxi > branch and resend against that. Sorry for the hassle here. > Sure, no problem! I will rebase my V4 on your fixes/sunxi branch. Best regards, -- Mylène Josserand, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget @ 2017-03-21 7:42 ` Mylene Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylene Josserand @ 2017-03-21 7:42 UTC (permalink / raw) To: linux-arm-kernel Hi Mark, On 20/03/2017 18:39, Mark Brown wrote: > On Sat, Mar 18, 2017 at 08:55:05AM +0100, Myl?ne Josserand wrote: >> The "HP" widget is already present and take part to >> the analog part (sun8i-codec-analog). >> >> Remove it from the digital part as it is unnecessary. > > I know I said to send against Linus' tree but it turns out this actually > conflicts with some of the existing fixes, please see my fixes/sunxi > branch and resend against that. Sorry for the hassle here. > Sure, no problem! I will rebase my V4 on your fixes/sunxi branch. Best regards, -- Myl?ne Josserand, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget @ 2017-03-21 7:42 ` Mylene Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylene Josserand @ 2017-03-21 7:42 UTC (permalink / raw) To: Mark Brown Cc: mark.rutland, devicetree, alsa-devel, linux-kernel, tiwai, lgirdwood, wens, robh+dt, alexandre.belloni, maxime.ripard, thomas.petazzoni, linux-arm-kernel Hi Mark, On 20/03/2017 18:39, Mark Brown wrote: > On Sat, Mar 18, 2017 at 08:55:05AM +0100, Mylène Josserand wrote: >> The "HP" widget is already present and take part to >> the analog part (sun8i-codec-analog). >> >> Remove it from the digital part as it is unnecessary. > > I know I said to send against Linus' tree but it turns out this actually > conflicts with some of the existing fixes, please see my fixes/sunxi > branch and resend against that. Sorry for the hassle here. > Sure, no problem! I will rebase my V4 on your fixes/sunxi branch. Best regards, -- Mylène Josserand, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget 2017-03-20 17:39 ` Mark Brown @ 2017-03-21 9:00 ` Mylene Josserand -1 siblings, 0 replies; 52+ messages in thread From: Mylene Josserand @ 2017-03-21 9:00 UTC (permalink / raw) To: Mark Brown Cc: lgirdwood, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland, alsa-devel, linux-arm-kernel, linux-kernel, devicetree, thomas.petazzoni, alexandre.belloni Mark, On 20/03/2017 18:39, Mark Brown wrote: > On Sat, Mar 18, 2017 at 08:55:05AM +0100, Mylène Josserand wrote: >> The "HP" widget is already present and take part to >> the analog part (sun8i-codec-analog). >> >> Remove it from the digital part as it is unnecessary. > > I know I said to send against Linus' tree but it turns out this actually > conflicts with some of the existing fixes, please see my fixes/sunxi > branch and resend against that. Sorry for the hassle here. > It does not apply because my driver ("sun8i-codec") is, currently, not available in your fix/sunxi branch: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/tree/sound/soc/sunxi?h=fix/sunxi Should I apply the patches (which add my driver) as "dependencies" and indicate it in my cover letter? Let me know what I should do. Thank you for the help! Best regards, -- Mylène Josserand, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget @ 2017-03-21 9:00 ` Mylene Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylene Josserand @ 2017-03-21 9:00 UTC (permalink / raw) To: linux-arm-kernel Mark, On 20/03/2017 18:39, Mark Brown wrote: > On Sat, Mar 18, 2017 at 08:55:05AM +0100, Myl?ne Josserand wrote: >> The "HP" widget is already present and take part to >> the analog part (sun8i-codec-analog). >> >> Remove it from the digital part as it is unnecessary. > > I know I said to send against Linus' tree but it turns out this actually > conflicts with some of the existing fixes, please see my fixes/sunxi > branch and resend against that. Sorry for the hassle here. > It does not apply because my driver ("sun8i-codec") is, currently, not available in your fix/sunxi branch: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/tree/sound/soc/sunxi?h=fix/sunxi Should I apply the patches (which add my driver) as "dependencies" and indicate it in my cover letter? Let me know what I should do. Thank you for the help! Best regards, -- Myl?ne Josserand, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-18 7:55 ` Mylène Josserand -1 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: alsa-devel, linux-arm-kernel, linux-kernel, devicetree, thomas.petazzoni, alexandre.belloni, Mylène Josserand Update the driver to use the new SOC_DAPM_DOUBLE definition on the digital DAC mixer. Update the names accordingly as, when they are shared, the controls are not prefixed with the widget's name anymore. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index d60f6fbd36a2..107fa8213600 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, return 0; } -static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = { - SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0), - SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0), - SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0), - SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0), -}; - -static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = { - SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC, +static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = { + SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch", + SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), - SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC, + SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch", + SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), - SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC, + SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), - SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC, + SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), }; @@ -293,12 +288,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC Mixers */ - SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0, - sun8i_output_left_mixer_controls, - ARRAY_SIZE(sun8i_output_left_mixer_controls)), - SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0, - sun8i_output_right_mixer_controls, - ARRAY_SIZE(sun8i_output_right_mixer_controls)), + SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, + sun8i_dac_mixer_controls, + ARRAY_SIZE(sun8i_dac_mixer_controls)), + SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0, + sun8i_dac_mixer_controls, + ARRAY_SIZE(sun8i_dac_mixer_controls)), /* Clocks */ SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, @@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "Digital Right DAC", NULL, "DAC" }, /* DAC Mixer Routes */ - { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, - { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, + { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", + "Digital Left DAC"}, + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", + "Digital Right DAC"}, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: linux-arm-kernel Update the driver to use the new SOC_DAPM_DOUBLE definition on the digital DAC mixer. Update the names accordingly as, when they are shared, the controls are not prefixed with the widget's name anymore. Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index d60f6fbd36a2..107fa8213600 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, return 0; } -static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = { - SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0), - SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0), - SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0), - SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0), -}; - -static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = { - SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC, +static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = { + SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch", + SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), - SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC, + SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch", + SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), - SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC, + SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), - SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC, + SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), }; @@ -293,12 +288,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC Mixers */ - SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0, - sun8i_output_left_mixer_controls, - ARRAY_SIZE(sun8i_output_left_mixer_controls)), - SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0, - sun8i_output_right_mixer_controls, - ARRAY_SIZE(sun8i_output_right_mixer_controls)), + SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, + sun8i_dac_mixer_controls, + ARRAY_SIZE(sun8i_dac_mixer_controls)), + SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0, + sun8i_dac_mixer_controls, + ARRAY_SIZE(sun8i_dac_mixer_controls)), /* Clocks */ SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, @@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "Digital Right DAC", NULL, "DAC" }, /* DAC Mixer Routes */ - { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, - { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, + { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", + "Digital Left DAC"}, + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", + "Digital Right DAC"}, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel, alexandre.belloni, Mylène Josserand, linux-arm-kernel Update the driver to use the new SOC_DAPM_DOUBLE definition on the digital DAC mixer. Update the names accordingly as, when they are shared, the controls are not prefixed with the widget's name anymore. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index d60f6fbd36a2..107fa8213600 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, return 0; } -static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = { - SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0), - SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0), - SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0), - SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC, - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0), -}; - -static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = { - SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC, +static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = { + SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch", + SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), - SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC, + SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch", + SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), - SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC, + SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), - SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC, + SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), }; @@ -293,12 +288,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC Mixers */ - SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0, - sun8i_output_left_mixer_controls, - ARRAY_SIZE(sun8i_output_left_mixer_controls)), - SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0, - sun8i_output_right_mixer_controls, - ARRAY_SIZE(sun8i_output_right_mixer_controls)), + SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, + sun8i_dac_mixer_controls, + ARRAY_SIZE(sun8i_dac_mixer_controls)), + SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0, + sun8i_dac_mixer_controls, + ARRAY_SIZE(sun8i_dac_mixer_controls)), /* Clocks */ SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, @@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "Digital Right DAC", NULL, "DAC" }, /* DAC Mixer Routes */ - { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, - { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, + { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", + "Digital Left DAC"}, + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", + "Digital Right DAC"}, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply related [flat|nested] 52+ messages in thread
* Re: [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-20 11:46 ` Chen-Yu Tsai -1 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:46 UTC (permalink / raw) To: Mylène Josserand Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Linux-ALSA, linux-arm-kernel, linux-kernel, devicetree, Thomas Petazzoni, Alexandre Belloni On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand <mylene.josserand@free-electrons.com> wrote: > Update the driver to use the new SOC_DAPM_DOUBLE definition > on the digital DAC mixer. > Update the names accordingly as, when they are shared, the > controls are not prefixed with the widget's name anymore. > > Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> > --- > sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++----------------------- > 1 file changed, 21 insertions(+), 24 deletions(-) > > diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c > index d60f6fbd36a2..107fa8213600 100644 > --- a/sound/soc/sunxi/sun8i-codec.c > +++ b/sound/soc/sunxi/sun8i-codec.c > @@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, > return 0; > } > > -static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = { > - SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0), > - SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0), > - SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0), > - SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0), > -}; > - > -static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = { > - SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC, > +static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = { > + SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch", > + SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), > - SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC, > + SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch", > + SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), > - SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC, > + SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), > - SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC, > + SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), > }; > > @@ -293,12 +288,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { > SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), > > /* DAC Mixers */ > - SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0, > - sun8i_output_left_mixer_controls, > - ARRAY_SIZE(sun8i_output_left_mixer_controls)), > - SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0, > - sun8i_output_right_mixer_controls, > - ARRAY_SIZE(sun8i_output_right_mixer_controls)), > + SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, > + sun8i_dac_mixer_controls, > + ARRAY_SIZE(sun8i_dac_mixer_controls)), > + SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0, > + sun8i_dac_mixer_controls, > + ARRAY_SIZE(sun8i_dac_mixer_controls)), > > /* Clocks */ > SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, > @@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { > { "Digital Right DAC", NULL, "DAC" }, > > /* DAC Mixer Routes */ > - { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, > - { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, > + { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", > + "Digital Left DAC"}, > + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", The extra space fixed in the next patch could be squashed into this patch. Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> > + "Digital Right DAC"}, > }; > > static struct snd_soc_dai_ops sun8i_codec_dai_ops = { > -- > 2.11.0 > ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE @ 2017-03-20 11:46 ` Chen-Yu Tsai 0 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:46 UTC (permalink / raw) To: linux-arm-kernel On Sat, Mar 18, 2017 at 3:55 PM, Myl?ne Josserand <mylene.josserand@free-electrons.com> wrote: > Update the driver to use the new SOC_DAPM_DOUBLE definition > on the digital DAC mixer. > Update the names accordingly as, when they are shared, the > controls are not prefixed with the widget's name anymore. > > Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> > --- > sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++----------------------- > 1 file changed, 21 insertions(+), 24 deletions(-) > > diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c > index d60f6fbd36a2..107fa8213600 100644 > --- a/sound/soc/sunxi/sun8i-codec.c > +++ b/sound/soc/sunxi/sun8i-codec.c > @@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, > return 0; > } > > -static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = { > - SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0), > - SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0), > - SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0), > - SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0), > -}; > - > -static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = { > - SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC, > +static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = { > + SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch", > + SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), > - SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC, > + SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch", > + SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), > - SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC, > + SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), > - SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC, > + SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), > }; > > @@ -293,12 +288,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { > SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), > > /* DAC Mixers */ > - SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0, > - sun8i_output_left_mixer_controls, > - ARRAY_SIZE(sun8i_output_left_mixer_controls)), > - SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0, > - sun8i_output_right_mixer_controls, > - ARRAY_SIZE(sun8i_output_right_mixer_controls)), > + SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, > + sun8i_dac_mixer_controls, > + ARRAY_SIZE(sun8i_dac_mixer_controls)), > + SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0, > + sun8i_dac_mixer_controls, > + ARRAY_SIZE(sun8i_dac_mixer_controls)), > > /* Clocks */ > SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, > @@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { > { "Digital Right DAC", NULL, "DAC" }, > > /* DAC Mixer Routes */ > - { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, > - { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, > + { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", > + "Digital Left DAC"}, > + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", The extra space fixed in the next patch could be squashed into this patch. Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> > + "Digital Right DAC"}, > }; > > static struct snd_soc_dai_ops sun8i_codec_dai_ops = { > -- > 2.11.0 > ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE @ 2017-03-20 11:46 ` Chen-Yu Tsai 0 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:46 UTC (permalink / raw) To: Mylène Josserand Cc: Mark Rutland, devicetree, Linux-ALSA, linux-kernel, Takashi Iwai, Rob Herring, Liam Girdwood, Chen-Yu Tsai, Mark Brown, Alexandre Belloni, Maxime Ripard, Thomas Petazzoni, linux-arm-kernel On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand <mylene.josserand@free-electrons.com> wrote: > Update the driver to use the new SOC_DAPM_DOUBLE definition > on the digital DAC mixer. > Update the names accordingly as, when they are shared, the > controls are not prefixed with the widget's name anymore. > > Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> > --- > sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++----------------------- > 1 file changed, 21 insertions(+), 24 deletions(-) > > diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c > index d60f6fbd36a2..107fa8213600 100644 > --- a/sound/soc/sunxi/sun8i-codec.c > +++ b/sound/soc/sunxi/sun8i-codec.c > @@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, > return 0; > } > > -static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = { > - SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0), > - SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0), > - SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0), > - SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC, > - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0), > -}; > - > -static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = { > - SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC, > +static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = { > + SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch", > + SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), > - SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC, > + SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch", > + SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), > - SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC, > + SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), > - SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC, > + SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, > + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, > SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), > }; > > @@ -293,12 +288,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { > SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), > > /* DAC Mixers */ > - SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0, > - sun8i_output_left_mixer_controls, > - ARRAY_SIZE(sun8i_output_left_mixer_controls)), > - SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0, > - sun8i_output_right_mixer_controls, > - ARRAY_SIZE(sun8i_output_right_mixer_controls)), > + SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, > + sun8i_dac_mixer_controls, > + ARRAY_SIZE(sun8i_dac_mixer_controls)), > + SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0, > + sun8i_dac_mixer_controls, > + ARRAY_SIZE(sun8i_dac_mixer_controls)), > > /* Clocks */ > SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, > @@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { > { "Digital Right DAC", NULL, "DAC" }, > > /* DAC Mixer Routes */ > - { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, > - { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, > + { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", > + "Digital Left DAC"}, > + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", The extra space fixed in the next patch could be squashed into this patch. Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> > + "Digital Right DAC"}, > }; > > static struct snd_soc_dai_ops sun8i_codec_dai_ops = { > -- > 2.11.0 > _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE 2017-03-20 11:46 ` Chen-Yu Tsai (?) @ 2017-03-20 15:30 ` Mylene Josserand -1 siblings, 0 replies; 52+ messages in thread From: Mylene Josserand @ 2017-03-20 15:30 UTC (permalink / raw) To: Chen-Yu Tsai Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, Maxime Ripard, Rob Herring, Mark Rutland, Linux-ALSA, linux-arm-kernel, linux-kernel, devicetree, Thomas Petazzoni, Alexandre Belloni Hi Chen-Yu, On 20/03/2017 12:46, Chen-Yu Tsai wrote: > On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand > <mylene.josserand@free-electrons.com> wrote: >> Update the driver to use the new SOC_DAPM_DOUBLE definition >> on the digital DAC mixer. >> Update the names accordingly as, when they are shared, the >> controls are not prefixed with the widget's name anymore. >> >> Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> >> --- >> sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++----------------------- >> 1 file changed, 21 insertions(+), 24 deletions(-) >> >> diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c >> index d60f6fbd36a2..107fa8213600 100644 >> --- a/sound/soc/sunxi/sun8i-codec.c >> +++ b/sound/soc/sunxi/sun8i-codec.c >> @@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, >> return 0; >> } >> >> -static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = { >> - SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0), >> - SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0), >> - SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0), >> - SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0), >> -}; >> - >> -static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = { >> - SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC, >> +static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = { >> + SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch", >> + SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), >> - SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC, >> + SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch", >> + SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), >> - SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC, >> + SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), >> - SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC, >> + SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), >> }; >> >> @@ -293,12 +288,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { >> SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), >> >> /* DAC Mixers */ >> - SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0, >> - sun8i_output_left_mixer_controls, >> - ARRAY_SIZE(sun8i_output_left_mixer_controls)), >> - SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0, >> - sun8i_output_right_mixer_controls, >> - ARRAY_SIZE(sun8i_output_right_mixer_controls)), >> + SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, >> + sun8i_dac_mixer_controls, >> + ARRAY_SIZE(sun8i_dac_mixer_controls)), >> + SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0, >> + sun8i_dac_mixer_controls, >> + ARRAY_SIZE(sun8i_dac_mixer_controls)), >> >> /* Clocks */ >> SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, >> @@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { >> { "Digital Right DAC", NULL, "DAC" }, >> >> /* DAC Mixer Routes */ >> - { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, >> - { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, >> + { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", >> + "Digital Left DAC"}, >> + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", > > The extra space fixed in the next patch could be squashed into this > patch. Otherwise, Oh, yes, sorry about that. I will send a V4 with the fixes you pointed me on this series. Thanks! Best regards, -- Mylène Josserand, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE @ 2017-03-20 15:30 ` Mylene Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylene Josserand @ 2017-03-20 15:30 UTC (permalink / raw) To: linux-arm-kernel Hi Chen-Yu, On 20/03/2017 12:46, Chen-Yu Tsai wrote: > On Sat, Mar 18, 2017 at 3:55 PM, Myl?ne Josserand > <mylene.josserand@free-electrons.com> wrote: >> Update the driver to use the new SOC_DAPM_DOUBLE definition >> on the digital DAC mixer. >> Update the names accordingly as, when they are shared, the >> controls are not prefixed with the widget's name anymore. >> >> Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> >> --- >> sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++----------------------- >> 1 file changed, 21 insertions(+), 24 deletions(-) >> >> diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c >> index d60f6fbd36a2..107fa8213600 100644 >> --- a/sound/soc/sunxi/sun8i-codec.c >> +++ b/sound/soc/sunxi/sun8i-codec.c >> @@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, >> return 0; >> } >> >> -static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = { >> - SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0), >> - SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0), >> - SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0), >> - SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0), >> -}; >> - >> -static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = { >> - SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC, >> +static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = { >> + SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch", >> + SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), >> - SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC, >> + SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch", >> + SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), >> - SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC, >> + SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), >> - SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC, >> + SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), >> }; >> >> @@ -293,12 +288,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { >> SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), >> >> /* DAC Mixers */ >> - SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0, >> - sun8i_output_left_mixer_controls, >> - ARRAY_SIZE(sun8i_output_left_mixer_controls)), >> - SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0, >> - sun8i_output_right_mixer_controls, >> - ARRAY_SIZE(sun8i_output_right_mixer_controls)), >> + SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, >> + sun8i_dac_mixer_controls, >> + ARRAY_SIZE(sun8i_dac_mixer_controls)), >> + SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0, >> + sun8i_dac_mixer_controls, >> + ARRAY_SIZE(sun8i_dac_mixer_controls)), >> >> /* Clocks */ >> SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, >> @@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { >> { "Digital Right DAC", NULL, "DAC" }, >> >> /* DAC Mixer Routes */ >> - { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, >> - { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, >> + { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", >> + "Digital Left DAC"}, >> + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", > > The extra space fixed in the next patch could be squashed into this > patch. Otherwise, Oh, yes, sorry about that. I will send a V4 with the fixes you pointed me on this series. Thanks! Best regards, -- Myl?ne Josserand, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE @ 2017-03-20 15:30 ` Mylene Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylene Josserand @ 2017-03-20 15:30 UTC (permalink / raw) To: Chen-Yu Tsai Cc: Mark Rutland, devicetree, Linux-ALSA, linux-kernel, Mark Brown, Takashi Iwai, Liam Girdwood, Rob Herring, Alexandre Belloni, Maxime Ripard, Thomas Petazzoni, linux-arm-kernel Hi Chen-Yu, On 20/03/2017 12:46, Chen-Yu Tsai wrote: > On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand > <mylene.josserand@free-electrons.com> wrote: >> Update the driver to use the new SOC_DAPM_DOUBLE definition >> on the digital DAC mixer. >> Update the names accordingly as, when they are shared, the >> controls are not prefixed with the widget's name anymore. >> >> Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> >> --- >> sound/soc/sunxi/sun8i-codec.c | 45 ++++++++++++++++++++----------------------- >> 1 file changed, 21 insertions(+), 24 deletions(-) >> >> diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c >> index d60f6fbd36a2..107fa8213600 100644 >> --- a/sound/soc/sunxi/sun8i-codec.c >> +++ b/sound/soc/sunxi/sun8i-codec.c >> @@ -259,25 +259,20 @@ static int sun8i_codec_hw_params(struct snd_pcm_substream *substream, >> return 0; >> } >> >> -static const struct snd_kcontrol_new sun8i_output_left_mixer_controls[] = { >> - SOC_DAPM_SINGLE("LSlot 0", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, 1, 0), >> - SOC_DAPM_SINGLE("LSlot 1", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, 1, 0), >> - SOC_DAPM_SINGLE("DACL", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, 1, 0), >> - SOC_DAPM_SINGLE("ADCL", SUN8I_DAC_MXR_SRC, >> - SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, 1, 0), >> -}; >> - >> -static const struct snd_kcontrol_new sun8i_output_right_mixer_controls[] = { >> - SOC_DAPM_SINGLE("RSlot 0", SUN8I_DAC_MXR_SRC, >> +static const struct snd_kcontrol_new sun8i_dac_mixer_controls[] = { >> + SOC_DAPM_DOUBLE("AIF1 Slot 0 Digital DAC Playback Switch", >> + SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA0L, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA0R, 1, 0), >> - SOC_DAPM_SINGLE("RSlot 1", SUN8I_DAC_MXR_SRC, >> + SOC_DAPM_DOUBLE("AIF1 Slot 1 Digital DAC Playback Switch", >> + SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF1DA1L, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF1DA1R, 1, 0), >> - SOC_DAPM_SINGLE("DACR", SUN8I_DAC_MXR_SRC, >> + SOC_DAPM_DOUBLE("AIF2 Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_AIF2DACL, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_AIF2DACR, 1, 0), >> - SOC_DAPM_SINGLE("ADCR", SUN8I_DAC_MXR_SRC, >> + SOC_DAPM_DOUBLE("ADC Digital DAC Playback Switch", SUN8I_DAC_MXR_SRC, >> + SUN8I_DAC_MXR_SRC_DACL_MXR_SRC_ADCL, >> SUN8I_DAC_MXR_SRC_DACR_MXR_SRC_ADCR, 1, 0), >> }; >> >> @@ -293,12 +288,12 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { >> SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), >> >> /* DAC Mixers */ >> - SND_SOC_DAPM_MIXER("Left DAC Mixer", SND_SOC_NOPM, 0, 0, >> - sun8i_output_left_mixer_controls, >> - ARRAY_SIZE(sun8i_output_left_mixer_controls)), >> - SND_SOC_DAPM_MIXER("Right DAC Mixer", SND_SOC_NOPM, 0, 0, >> - sun8i_output_right_mixer_controls, >> - ARRAY_SIZE(sun8i_output_right_mixer_controls)), >> + SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, >> + sun8i_dac_mixer_controls, >> + ARRAY_SIZE(sun8i_dac_mixer_controls)), >> + SND_SOC_DAPM_MIXER("Right Digital DAC Mixer", SND_SOC_NOPM, 0, 0, >> + sun8i_dac_mixer_controls, >> + ARRAY_SIZE(sun8i_dac_mixer_controls)), >> >> /* Clocks */ >> SND_SOC_DAPM_SUPPLY("MODCLK AFI1", SUN8I_MOD_CLK_ENA, >> @@ -340,8 +335,10 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { >> { "Digital Right DAC", NULL, "DAC" }, >> >> /* DAC Mixer Routes */ >> - { "Left DAC Mixer", "LSlot 0", "Digital Left DAC"}, >> - { "Right DAC Mixer", "RSlot 0", "Digital Right DAC"}, >> + { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", >> + "Digital Left DAC"}, >> + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", > > The extra space fixed in the next patch could be squashed into this > patch. Otherwise, Oh, yes, sorry about that. I will send a V4 with the fixes you pointed me on this series. Thanks! Best regards, -- Mylène Josserand, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 3/5] ASoC: sun8i-codec: Fix space on audio-routing widget 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-18 7:55 ` Mylène Josserand -1 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: alsa-devel, linux-arm-kernel, linux-kernel, devicetree, thomas.petazzoni, alexandre.belloni, Mylène Josserand An unwanted space is present in an audio widget's name on the dapm routing. It causes an error on the recognition of this widget (error: ("no dapm match for AIF1 Slot 0 Right"). Remove the space fixes it. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index 107fa8213600..adb13fbd2006 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -337,7 +337,7 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { /* DAC Mixer Routes */ { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", "Digital Left DAC"}, - { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", "Digital Right DAC"}, }; -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 3/5] ASoC: sun8i-codec: Fix space on audio-routing widget @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: linux-arm-kernel An unwanted space is present in an audio widget's name on the dapm routing. It causes an error on the recognition of this widget (error: ("no dapm match for AIF1 Slot 0 Right"). Remove the space fixes it. Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index 107fa8213600..adb13fbd2006 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -337,7 +337,7 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { /* DAC Mixer Routes */ { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", "Digital Left DAC"}, - { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", "Digital Right DAC"}, }; -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 3/5] ASoC: sun8i-codec: Fix space on audio-routing widget @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel, alexandre.belloni, Mylène Josserand, linux-arm-kernel An unwanted space is present in an audio widget's name on the dapm routing. It causes an error on the recognition of this widget (error: ("no dapm match for AIF1 Slot 0 Right"). Remove the space fixes it. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index 107fa8213600..adb13fbd2006 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -337,7 +337,7 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { /* DAC Mixer Routes */ { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", "Digital Left DAC"}, - { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch ", + { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", "Digital Right DAC"}, }; -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply related [flat|nested] 52+ messages in thread
* Re: [PATCH v3 3/5] ASoC: sun8i-codec: Fix space on audio-routing widget 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-20 11:47 ` Chen-Yu Tsai -1 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:47 UTC (permalink / raw) To: Mylène Josserand Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Linux-ALSA, linux-arm-kernel, linux-kernel, devicetree, Thomas Petazzoni, Alexandre Belloni On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand <mylene.josserand@free-electrons.com> wrote: > An unwanted space is present in an audio widget's name on the dapm > routing. It causes an error on the recognition of this widget (error: > ("no dapm match for AIF1 Slot 0 Right"). > > Remove the space fixes it. > > Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> As mentioned, this patch can be squashed into the previous patch, now that you're resending the whole bunch of patches. Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 3/5] ASoC: sun8i-codec: Fix space on audio-routing widget @ 2017-03-20 11:47 ` Chen-Yu Tsai 0 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:47 UTC (permalink / raw) To: linux-arm-kernel On Sat, Mar 18, 2017 at 3:55 PM, Myl?ne Josserand <mylene.josserand@free-electrons.com> wrote: > An unwanted space is present in an audio widget's name on the dapm > routing. It causes an error on the recognition of this widget (error: > ("no dapm match for AIF1 Slot 0 Right"). > > Remove the space fixes it. > > Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> As mentioned, this patch can be squashed into the previous patch, now that you're resending the whole bunch of patches. Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 3/5] ASoC: sun8i-codec: Fix space on audio-routing widget @ 2017-03-20 11:47 ` Chen-Yu Tsai 0 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:47 UTC (permalink / raw) To: Mylène Josserand Cc: Mark Rutland, devicetree, Linux-ALSA, linux-kernel, Takashi Iwai, Rob Herring, Liam Girdwood, Chen-Yu Tsai, Mark Brown, Alexandre Belloni, Maxime Ripard, Thomas Petazzoni, linux-arm-kernel On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand <mylene.josserand@free-electrons.com> wrote: > An unwanted space is present in an audio widget's name on the dapm > routing. It causes an error on the recognition of this widget (error: > ("no dapm match for AIF1 Slot 0 Right"). > > Remove the space fixes it. > > Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> As mentioned, this patch can be squashed into the previous patch, now that you're resending the whole bunch of patches. Otherwise, Acked-by: Chen-Yu Tsai <wens@csie.org> _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-18 7:55 ` Mylène Josserand -1 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: alsa-devel, linux-arm-kernel, linux-kernel, devicetree, thomas.petazzoni, alexandre.belloni, Mylène Josserand Update the driver to use SND_SOC_DAPM_AIF_IN instead of SND_SOC_DAPM_DAC. Rename the interface's widgets to be more precise on which slot the interface is connected. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index adb13fbd2006..7527ba29a5a0 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, 0, NULL, 0), - /* Analog DAC */ - SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), - SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), + /* Analog DAC AIF */ + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC Mixers */ SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, @@ -331,14 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "DAC", NULL, "MODCLK DAC" }, /* DAC Routes */ - { "Digital Left DAC", NULL, "DAC" }, - { "Digital Right DAC", NULL, "DAC" }, + { "AIF1 Slot 0 Right", NULL, "DAC" }, + { "AIF1 Slot 0 Left", NULL, "DAC" }, /* DAC Mixer Routes */ { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Left DAC"}, + "AIF1 Slot 0 Left"}, { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Right DAC"}, + "AIF1 Slot 0 Right"}, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: linux-arm-kernel Update the driver to use SND_SOC_DAPM_AIF_IN instead of SND_SOC_DAPM_DAC. Rename the interface's widgets to be more precise on which slot the interface is connected. Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index adb13fbd2006..7527ba29a5a0 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, 0, NULL, 0), - /* Analog DAC */ - SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), - SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), + /* Analog DAC AIF */ + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC Mixers */ SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, @@ -331,14 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "DAC", NULL, "MODCLK DAC" }, /* DAC Routes */ - { "Digital Left DAC", NULL, "DAC" }, - { "Digital Right DAC", NULL, "DAC" }, + { "AIF1 Slot 0 Right", NULL, "DAC" }, + { "AIF1 Slot 0 Left", NULL, "DAC" }, /* DAC Mixer Routes */ { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Left DAC"}, + "AIF1 Slot 0 Left"}, { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Right DAC"}, + "AIF1 Slot 0 Right"}, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel, alexandre.belloni, Mylène Josserand, linux-arm-kernel Update the driver to use SND_SOC_DAPM_AIF_IN instead of SND_SOC_DAPM_DAC. Rename the interface's widgets to be more precise on which slot the interface is connected. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index adb13fbd2006..7527ba29a5a0 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, 0, NULL, 0), - /* Analog DAC */ - SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), - SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), + /* Analog DAC AIF */ + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC Mixers */ SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, @@ -331,14 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "DAC", NULL, "MODCLK DAC" }, /* DAC Routes */ - { "Digital Left DAC", NULL, "DAC" }, - { "Digital Right DAC", NULL, "DAC" }, + { "AIF1 Slot 0 Right", NULL, "DAC" }, + { "AIF1 Slot 0 Left", NULL, "DAC" }, /* DAC Mixer Routes */ { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Left DAC"}, + "AIF1 Slot 0 Left"}, { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Right DAC"}, + "AIF1 Slot 0 Right"}, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply related [flat|nested] 52+ messages in thread
* Re: [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-20 11:49 ` Chen-Yu Tsai -1 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:49 UTC (permalink / raw) To: Mylène Josserand Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai, Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Linux-ALSA, linux-arm-kernel, linux-kernel, devicetree, Thomas Petazzoni, Alexandre Belloni On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand <mylene.josserand@free-electrons.com> wrote: > Update the driver to use SND_SOC_DAPM_AIF_IN instead of > SND_SOC_DAPM_DAC. > Rename the interface's widgets to be more precise on which slot > the interface is connected. > > Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> > --- > sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > > diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c > index adb13fbd2006..7527ba29a5a0 100644 > --- a/sound/soc/sunxi/sun8i-codec.c > +++ b/sound/soc/sunxi/sun8i-codec.c [...] > @@ -331,14 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { > { "DAC", NULL, "MODCLK DAC" }, > > /* DAC Routes */ > - { "Digital Left DAC", NULL, "DAC" }, > - { "Digital Right DAC", NULL, "DAC" }, > + { "AIF1 Slot 0 Right", NULL, "DAC" }, > + { "AIF1 Slot 0 Left", NULL, "DAC" }, Nit on the order (should be left before right), but otherwise Acked-by: Chen-Yu Tsai <wens@csie.org> > > /* DAC Mixer Routes */ > { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", > - "Digital Left DAC"}, > + "AIF1 Slot 0 Left"}, > { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", > - "Digital Right DAC"}, > + "AIF1 Slot 0 Right"}, > }; > > static struct snd_soc_dai_ops sun8i_codec_dai_ops = { > -- > 2.11.0 > ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN @ 2017-03-20 11:49 ` Chen-Yu Tsai 0 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:49 UTC (permalink / raw) To: linux-arm-kernel On Sat, Mar 18, 2017 at 3:55 PM, Myl?ne Josserand <mylene.josserand@free-electrons.com> wrote: > Update the driver to use SND_SOC_DAPM_AIF_IN instead of > SND_SOC_DAPM_DAC. > Rename the interface's widgets to be more precise on which slot > the interface is connected. > > Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> > --- > sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > > diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c > index adb13fbd2006..7527ba29a5a0 100644 > --- a/sound/soc/sunxi/sun8i-codec.c > +++ b/sound/soc/sunxi/sun8i-codec.c [...] > @@ -331,14 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { > { "DAC", NULL, "MODCLK DAC" }, > > /* DAC Routes */ > - { "Digital Left DAC", NULL, "DAC" }, > - { "Digital Right DAC", NULL, "DAC" }, > + { "AIF1 Slot 0 Right", NULL, "DAC" }, > + { "AIF1 Slot 0 Left", NULL, "DAC" }, Nit on the order (should be left before right), but otherwise Acked-by: Chen-Yu Tsai <wens@csie.org> > > /* DAC Mixer Routes */ > { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", > - "Digital Left DAC"}, > + "AIF1 Slot 0 Left"}, > { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", > - "Digital Right DAC"}, > + "AIF1 Slot 0 Right"}, > }; > > static struct snd_soc_dai_ops sun8i_codec_dai_ops = { > -- > 2.11.0 > ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN @ 2017-03-20 11:49 ` Chen-Yu Tsai 0 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:49 UTC (permalink / raw) To: Mylène Josserand Cc: Mark Rutland, devicetree, Linux-ALSA, linux-kernel, Takashi Iwai, Rob Herring, Liam Girdwood, Chen-Yu Tsai, Mark Brown, Alexandre Belloni, Maxime Ripard, Thomas Petazzoni, linux-arm-kernel On Sat, Mar 18, 2017 at 3:55 PM, Mylène Josserand <mylene.josserand@free-electrons.com> wrote: > Update the driver to use SND_SOC_DAPM_AIF_IN instead of > SND_SOC_DAPM_DAC. > Rename the interface's widgets to be more precise on which slot > the interface is connected. > > Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> > --- > sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++--------- > 1 file changed, 11 insertions(+), 9 deletions(-) > > diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c > index adb13fbd2006..7527ba29a5a0 100644 > --- a/sound/soc/sunxi/sun8i-codec.c > +++ b/sound/soc/sunxi/sun8i-codec.c [...] > @@ -331,14 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { > { "DAC", NULL, "MODCLK DAC" }, > > /* DAC Routes */ > - { "Digital Left DAC", NULL, "DAC" }, > - { "Digital Right DAC", NULL, "DAC" }, > + { "AIF1 Slot 0 Right", NULL, "DAC" }, > + { "AIF1 Slot 0 Left", NULL, "DAC" }, Nit on the order (should be left before right), but otherwise Acked-by: Chen-Yu Tsai <wens@csie.org> > > /* DAC Mixer Routes */ > { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", > - "Digital Left DAC"}, > + "AIF1 Slot 0 Left"}, > { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", > - "Digital Right DAC"}, > + "AIF1 Slot 0 Right"}, > }; > > static struct snd_soc_dai_ops sun8i_codec_dai_ops = { > -- > 2.11.0 > _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 52+ messages in thread
* Applied "ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN" to the asoc tree 2017-03-18 7:55 ` Mylène Josserand @ 2017-03-21 18:45 ` Mark Brown -1 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-21 18:45 UTC (permalink / raw) Cc: mark.rutland, thomas.petazzoni, alsa-devel, Mylène Josserand, devicetree, linux-kernel, tiwai, robh+dt, lgirdwood, wens, broonie, alexandre.belloni, maxime.ripard, linux-arm-kernel [-- Attachment #1: Type: text/plain, Size: 3414 bytes --] The patch ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN has been applied to the asoc tree at git://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 d1792285ca63e17f8a7eb42efa48834c261a2d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?= <mylene.josserand@free-electrons.com> Date: Sat, 18 Mar 2017 08:55:08 +0100 Subject: [PATCH] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the driver to use SND_SOC_DAPM_AIF_IN instead of SND_SOC_DAPM_DAC. Rename the interface's widgets to be more precise on which slot the interface is connected. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index adb13fbd2006..7527ba29a5a0 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, 0, NULL, 0), - /* Analog DAC */ - SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), - SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), + /* Analog DAC AIF */ + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC Mixers */ SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, @@ -331,14 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "DAC", NULL, "MODCLK DAC" }, /* DAC Routes */ - { "Digital Left DAC", NULL, "DAC" }, - { "Digital Right DAC", NULL, "DAC" }, + { "AIF1 Slot 0 Right", NULL, "DAC" }, + { "AIF1 Slot 0 Left", NULL, "DAC" }, /* DAC Mixer Routes */ { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Left DAC"}, + "AIF1 Slot 0 Left"}, { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Right DAC"}, + "AIF1 Slot 0 Right"}, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply related [flat|nested] 52+ messages in thread
* Applied "ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN" to the asoc tree @ 2017-03-21 18:45 ` Mark Brown 0 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-21 18:45 UTC (permalink / raw) To: linux-arm-kernel The patch ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN has been applied to the asoc tree at git://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 d1792285ca63e17f8a7eb42efa48834c261a2d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?= <mylene.josserand@free-electrons.com> Date: Sat, 18 Mar 2017 08:55:08 +0100 Subject: [PATCH] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update the driver to use SND_SOC_DAPM_AIF_IN instead of SND_SOC_DAPM_DAC. Rename the interface's widgets to be more precise on which slot the interface is connected. Signed-off-by: Myl??ne Josserand <mylene.josserand@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Mark Brown <broonie@kernel.org> --- sound/soc/sunxi/sun8i-codec.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index adb13fbd2006..7527ba29a5a0 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -281,11 +281,13 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("DAC", SUN8I_DAC_DIG_CTRL, SUN8I_DAC_DIG_CTRL_ENDA, 0, NULL, 0), - /* Analog DAC */ - SND_SOC_DAPM_DAC("Digital Left DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), - SND_SOC_DAPM_DAC("Digital Right DAC", "Playback", SUN8I_AIF1_DACDAT_CTRL, - SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), + /* Analog DAC AIF */ + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0), + SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0, + SUN8I_AIF1_DACDAT_CTRL, + SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0), /* DAC Mixers */ SND_SOC_DAPM_MIXER("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0, @@ -331,14 +333,14 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = { { "DAC", NULL, "MODCLK DAC" }, /* DAC Routes */ - { "Digital Left DAC", NULL, "DAC" }, - { "Digital Right DAC", NULL, "DAC" }, + { "AIF1 Slot 0 Right", NULL, "DAC" }, + { "AIF1 Slot 0 Left", NULL, "DAC" }, /* DAC Mixer Routes */ { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Left DAC"}, + "AIF1 Slot 0 Left"}, { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", - "Digital Right DAC"}, + "AIF1 Slot 0 Right"}, }; static struct snd_soc_dai_ops sun8i_codec_dai_ops = { -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-18 7:55 ` Mylène Josserand -1 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: alsa-devel, linux-arm-kernel, linux-kernel, devicetree, thomas.petazzoni, alexandre.belloni, Mylène Josserand The digital AIF interfaces has been renamed in the sun8i audio codec driver so the audio-routing in the device tree must be renamed too. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 18c174fef84f..0467fb365bfc 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -113,8 +113,8 @@ simple-audio-card,mclk-fs = <512>; simple-audio-card,aux-devs = <&codec_analog>; simple-audio-card,routing = - "Left DAC", "Digital Left DAC", - "Right DAC", "Digital Right DAC"; + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right"; status = "disabled"; simple-audio-card,cpu { -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: linux-arm-kernel The digital AIF interfaces has been renamed in the sun8i audio codec driver so the audio-routing in the device tree must be renamed too. Signed-off-by: Myl?ne Josserand <mylene.josserand@free-electrons.com> --- arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 18c174fef84f..0467fb365bfc 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -113,8 +113,8 @@ simple-audio-card,mclk-fs = <512>; simple-audio-card,aux-devs = <&codec_analog>; simple-audio-card,routing = - "Left DAC", "Digital Left DAC", - "Right DAC", "Digital Right DAC"; + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right"; status = "disabled"; simple-audio-card,cpu { -- 2.11.0 ^ permalink raw reply related [flat|nested] 52+ messages in thread
* [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets @ 2017-03-18 7:55 ` Mylène Josserand 0 siblings, 0 replies; 52+ messages in thread From: Mylène Josserand @ 2017-03-18 7:55 UTC (permalink / raw) To: lgirdwood, broonie, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland Cc: thomas.petazzoni, devicetree, alsa-devel, linux-kernel, alexandre.belloni, Mylène Josserand, linux-arm-kernel The digital AIF interfaces has been renamed in the sun8i audio codec driver so the audio-routing in the device tree must be renamed too. Signed-off-by: Mylène Josserand <mylene.josserand@free-electrons.com> --- arch/arm/boot/dts/sun8i-a33.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi index 18c174fef84f..0467fb365bfc 100644 --- a/arch/arm/boot/dts/sun8i-a33.dtsi +++ b/arch/arm/boot/dts/sun8i-a33.dtsi @@ -113,8 +113,8 @@ simple-audio-card,mclk-fs = <512>; simple-audio-card,aux-devs = <&codec_analog>; simple-audio-card,routing = - "Left DAC", "Digital Left DAC", - "Right DAC", "Digital Right DAC"; + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right"; status = "disabled"; simple-audio-card,cpu { -- 2.11.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply related [flat|nested] 52+ messages in thread
* Re: [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets 2017-03-18 7:55 ` Mylène Josserand (?) @ 2017-03-20 11:38 ` Mark Brown -1 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-20 11:38 UTC (permalink / raw) To: Mylène Josserand Cc: lgirdwood, perex, tiwai, maxime.ripard, wens, robh+dt, mark.rutland, alsa-devel, linux-arm-kernel, linux-kernel, devicetree, thomas.petazzoni, alexandre.belloni [-- Attachment #1: Type: text/plain, Size: 343 bytes --] On Sat, Mar 18, 2017 at 08:55:09AM +0100, Mylène Josserand wrote: > The digital AIF interfaces has been renamed in the sun8i audio codec > driver so the audio-routing in the device tree must be renamed too. Given that these are fixes it probably makes sense that they all go in together, can I get some acks for this and I'll apply it? [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets @ 2017-03-20 11:38 ` Mark Brown 0 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-20 11:38 UTC (permalink / raw) To: linux-arm-kernel On Sat, Mar 18, 2017 at 08:55:09AM +0100, Myl?ne Josserand wrote: > The digital AIF interfaces has been renamed in the sun8i audio codec > driver so the audio-routing in the device tree must be renamed too. Given that these are fixes it probably makes sense that they all go in together, can I get some acks for this and I'll apply it? -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170320/80765819/attachment.sig> ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets @ 2017-03-20 11:38 ` Mark Brown 0 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-20 11:38 UTC (permalink / raw) To: Mylène Josserand Cc: mark.rutland, devicetree, alsa-devel, linux-kernel, tiwai, lgirdwood, wens, robh+dt, alexandre.belloni, maxime.ripard, thomas.petazzoni, linux-arm-kernel [-- Attachment #1.1: Type: text/plain, Size: 343 bytes --] On Sat, Mar 18, 2017 at 08:55:09AM +0100, Mylène Josserand wrote: > The digital AIF interfaces has been renamed in the sun8i audio codec > driver so the audio-routing in the device tree must be renamed too. Given that these are fixes it probably makes sense that they all go in together, can I get some acks for this and I'll apply it? [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets 2017-03-20 11:38 ` Mark Brown (?) @ 2017-03-20 11:53 ` Chen-Yu Tsai -1 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:53 UTC (permalink / raw) To: Mark Brown Cc: Mylène Josserand, Liam Girdwood, Jaroslav Kysela, Takashi Iwai, Maxime Ripard, Chen-Yu Tsai, Rob Herring, Mark Rutland, Linux-ALSA, linux-arm-kernel, linux-kernel, devicetree, Thomas Petazzoni, Alexandre Belloni On Mon, Mar 20, 2017 at 7:38 PM, Mark Brown <broonie@kernel.org> wrote: > On Sat, Mar 18, 2017 at 08:55:09AM +0100, Mylène Josserand wrote: >> The digital AIF interfaces has been renamed in the sun8i audio codec >> driver so the audio-routing in the device tree must be renamed too. > > Given that these are fixes it probably makes sense that they all go in > together, can I get some acks for this and I'll apply it? Acked-by: Chen-Yu Tsai <wens@csie.org> Though this patch should go in through the arm-soc tree. ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets @ 2017-03-20 11:53 ` Chen-Yu Tsai 0 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:53 UTC (permalink / raw) To: linux-arm-kernel On Mon, Mar 20, 2017 at 7:38 PM, Mark Brown <broonie@kernel.org> wrote: > On Sat, Mar 18, 2017 at 08:55:09AM +0100, Myl?ne Josserand wrote: >> The digital AIF interfaces has been renamed in the sun8i audio codec >> driver so the audio-routing in the device tree must be renamed too. > > Given that these are fixes it probably makes sense that they all go in > together, can I get some acks for this and I'll apply it? Acked-by: Chen-Yu Tsai <wens@csie.org> Though this patch should go in through the arm-soc tree. ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets @ 2017-03-20 11:53 ` Chen-Yu Tsai 0 siblings, 0 replies; 52+ messages in thread From: Chen-Yu Tsai @ 2017-03-20 11:53 UTC (permalink / raw) To: Mark Brown Cc: Mark Rutland, devicetree, Linux-ALSA, linux-kernel, Takashi Iwai, Liam Girdwood, Chen-Yu Tsai, Rob Herring, Alexandre Belloni, Maxime Ripard, Mylène Josserand, Thomas Petazzoni, linux-arm-kernel On Mon, Mar 20, 2017 at 7:38 PM, Mark Brown <broonie@kernel.org> wrote: > On Sat, Mar 18, 2017 at 08:55:09AM +0100, Mylène Josserand wrote: >> The digital AIF interfaces has been renamed in the sun8i audio codec >> driver so the audio-routing in the device tree must be renamed too. > > Given that these are fixes it probably makes sense that they all go in > together, can I get some acks for this and I'll apply it? Acked-by: Chen-Yu Tsai <wens@csie.org> Though this patch should go in through the arm-soc tree. _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets 2017-03-20 11:53 ` Chen-Yu Tsai (?) @ 2017-03-20 16:30 ` Mark Brown -1 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-20 16:30 UTC (permalink / raw) To: Chen-Yu Tsai Cc: Mylène Josserand, Liam Girdwood, Jaroslav Kysela, Takashi Iwai, Maxime Ripard, Rob Herring, Mark Rutland, Linux-ALSA, linux-arm-kernel, linux-kernel, devicetree, Thomas Petazzoni, Alexandre Belloni [-- Attachment #1: Type: text/plain, Size: 601 bytes --] On Mon, Mar 20, 2017 at 07:53:37PM +0800, Chen-Yu Tsai wrote: > On Mon, Mar 20, 2017 at 7:38 PM, Mark Brown <broonie@kernel.org> wrote: > > Given that these are fixes it probably makes sense that they all go in > > together, can I get some acks for this and I'll apply it? > Acked-by: Chen-Yu Tsai <wens@csie.org> > Though this patch should go in through the arm-soc tree. Well, ideally but I'm not sure it's a super big deal to get the odd bit coming through so long as it doesn't conflict, it's more of a big deal to make sure that we don't get the ASoC side without the DT side and vice versa. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 52+ messages in thread
* [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets @ 2017-03-20 16:30 ` Mark Brown 0 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-20 16:30 UTC (permalink / raw) To: linux-arm-kernel On Mon, Mar 20, 2017 at 07:53:37PM +0800, Chen-Yu Tsai wrote: > On Mon, Mar 20, 2017 at 7:38 PM, Mark Brown <broonie@kernel.org> wrote: > > Given that these are fixes it probably makes sense that they all go in > > together, can I get some acks for this and I'll apply it? > Acked-by: Chen-Yu Tsai <wens@csie.org> > Though this patch should go in through the arm-soc tree. Well, ideally but I'm not sure it's a super big deal to get the odd bit coming through so long as it doesn't conflict, it's more of a big deal to make sure that we don't get the ASoC side without the DT side and vice versa. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20170320/910a3028/attachment.sig> ^ permalink raw reply [flat|nested] 52+ messages in thread
* Re: [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets @ 2017-03-20 16:30 ` Mark Brown 0 siblings, 0 replies; 52+ messages in thread From: Mark Brown @ 2017-03-20 16:30 UTC (permalink / raw) To: Chen-Yu Tsai Cc: Mark Rutland, devicetree, Linux-ALSA, linux-kernel, Takashi Iwai, Liam Girdwood, Rob Herring, Alexandre Belloni, Maxime Ripard, Mylène Josserand, Thomas Petazzoni, linux-arm-kernel [-- Attachment #1.1: Type: text/plain, Size: 601 bytes --] On Mon, Mar 20, 2017 at 07:53:37PM +0800, Chen-Yu Tsai wrote: > On Mon, Mar 20, 2017 at 7:38 PM, Mark Brown <broonie@kernel.org> wrote: > > Given that these are fixes it probably makes sense that they all go in > > together, can I get some acks for this and I'll apply it? > Acked-by: Chen-Yu Tsai <wens@csie.org> > Though this patch should go in through the arm-soc tree. Well, ideally but I'm not sure it's a super big deal to get the odd bit coming through so long as it doesn't conflict, it's more of a big deal to make sure that we don't get the ASoC side without the DT side and vice versa. [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --] ^ permalink raw reply [flat|nested] 52+ messages in thread
end of thread, other threads:[~2017-03-21 18:45 UTC | newest] Thread overview: 52+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-03-18 7:55 [PATCH v3 0/5] ASoC: sun8i-a33 clean-up for 4.11 Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-18 7:55 ` [PATCH v3 1/5] ASoC: sun8i-codec: Remove analog "HP" widget Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-20 11:45 ` Chen-Yu Tsai 2017-03-20 11:45 ` Chen-Yu Tsai 2017-03-20 11:45 ` Chen-Yu Tsai 2017-03-20 17:39 ` Mark Brown 2017-03-20 17:39 ` Mark Brown 2017-03-20 17:39 ` Mark Brown 2017-03-21 7:42 ` Mylene Josserand 2017-03-21 7:42 ` Mylene Josserand 2017-03-21 7:42 ` Mylene Josserand 2017-03-21 9:00 ` Mylene Josserand 2017-03-21 9:00 ` Mylene Josserand 2017-03-18 7:55 ` [PATCH v3 2/5] ASoC: sun8i-codec: Update mixer to use SOC_DAPM_DOUBLE Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-20 11:46 ` Chen-Yu Tsai 2017-03-20 11:46 ` Chen-Yu Tsai 2017-03-20 11:46 ` Chen-Yu Tsai 2017-03-20 15:30 ` Mylene Josserand 2017-03-20 15:30 ` Mylene Josserand 2017-03-20 15:30 ` Mylene Josserand 2017-03-18 7:55 ` [PATCH v3 3/5] ASoC: sun8i-codec: Fix space on audio-routing widget Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-20 11:47 ` Chen-Yu Tsai 2017-03-20 11:47 ` Chen-Yu Tsai 2017-03-20 11:47 ` Chen-Yu Tsai 2017-03-18 7:55 ` [PATCH v3 4/5] ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-20 11:49 ` Chen-Yu Tsai 2017-03-20 11:49 ` Chen-Yu Tsai 2017-03-20 11:49 ` Chen-Yu Tsai 2017-03-21 18:45 ` Applied "ASoC: sun8i-codec: Convert to use SND_SOC_DAPM_AIF_IN" to the asoc tree Mark Brown 2017-03-21 18:45 ` Mark Brown 2017-03-18 7:55 ` [PATCH v3 5/5] ARM: dts: sun8i: Update audio-routing with renamed widgets Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-18 7:55 ` Mylène Josserand 2017-03-20 11:38 ` Mark Brown 2017-03-20 11:38 ` Mark Brown 2017-03-20 11:38 ` Mark Brown 2017-03-20 11:53 ` Chen-Yu Tsai 2017-03-20 11:53 ` Chen-Yu Tsai 2017-03-20 11:53 ` Chen-Yu Tsai 2017-03-20 16:30 ` Mark Brown 2017-03-20 16:30 ` Mark Brown 2017-03-20 16:30 ` Mark Brown
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.