From: Chen-Yu Tsai <wens@csie.org>
To: Samuel Holland <samuel@sholland.org>
Cc: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Maxime Ripard <mripard@kernel.org>,
Vasily Khoruzhick <anarsoul@gmail.com>,
Luca Weiss <luca@z3ntu.xyz>,
Linux-ALSA <alsa-devel@alsa-project.org>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 4/8] ASoC: sun50i-codec-analog: Make headphone routes stereo
Date: Mon, 17 Feb 2020 11:48:11 +0800 [thread overview]
Message-ID: <CAGb2v677p8u8_0jhcbN07QsyVc21dKJmeK6=rxLCbde+AOqreQ@mail.gmail.com> (raw)
In-Reply-To: <20200217021813.53266-5-samuel@sholland.org>
Hi,
On Mon, Feb 17, 2020 at 10:18 AM Samuel Holland <samuel@sholland.org> wrote:
>
> This matches the hardware more accurately, and is necessary for
> including the (stereo) headphone mute switch in the DAPM graph.
>
> Signed-off-by: Samuel Holland <samuel@sholland.org>
> ---
> sound/soc/sunxi/sun50i-codec-analog.c | 28 +++++++++++++++++++--------
> 1 file changed, 20 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/sunxi/sun50i-codec-analog.c b/sound/soc/sunxi/sun50i-codec-analog.c
> index 17165f1ddb63..f98851067f97 100644
> --- a/sound/soc/sunxi/sun50i-codec-analog.c
> +++ b/sound/soc/sunxi/sun50i-codec-analog.c
> @@ -311,9 +311,15 @@ static const struct snd_soc_dapm_widget sun50i_a64_codec_widgets[] = {
> */
>
> SND_SOC_DAPM_REGULATOR_SUPPLY("cpvdd", 0, 0),
> - SND_SOC_DAPM_MUX("Headphone Source Playback Route",
> + SND_SOC_DAPM_MUX("Left Headphone Source",
> SND_SOC_NOPM, 0, 0, sun50i_codec_hp_src),
> - SND_SOC_DAPM_OUT_DRV("Headphone Amp", SUN50I_ADDA_HP_CTRL,
> + SND_SOC_DAPM_MUX("Right Headphone Source",
Please don't remove the widget suffix. The suffix was chosen to work with
alsa-lib's control parsing code. The term "Playback Route" is appropriate
because it is playback only, and it is a routing switch, not a source or
sink.
Also, what's wrong with just having a single "stereo" widget instead of
two "mono" widgets? I added stereo (2-channel) support to DAPM quite
some time ago. You just have to have two routes in and out.
ChenYu
> + SND_SOC_NOPM, 0, 0, sun50i_codec_hp_src),
> + SND_SOC_DAPM_OUT_DRV("Left Headphone Amp",
> + SND_SOC_NOPM, 0, 0, NULL, 0),
> + SND_SOC_DAPM_OUT_DRV("Right Headphone Amp",
> + SND_SOC_NOPM, 0, 0, NULL, 0),
> + SND_SOC_DAPM_SUPPLY("Headphone Amp", SUN50I_ADDA_HP_CTRL,
> SUN50I_ADDA_HP_CTRL_HPPA_EN, 0, NULL, 0),
> SND_SOC_DAPM_OUTPUT("HP"),
>
> @@ -405,13 +411,19 @@ static const struct snd_soc_dapm_route sun50i_a64_codec_routes[] = {
> { "Right ADC", NULL, "Right ADC Mixer" },
>
> /* Headphone Routes */
> - { "Headphone Source Playback Route", "DAC", "Left DAC" },
> - { "Headphone Source Playback Route", "DAC", "Right DAC" },
> - { "Headphone Source Playback Route", "Mixer", "Left Mixer" },
> - { "Headphone Source Playback Route", "Mixer", "Right Mixer" },
> - { "Headphone Amp", NULL, "Headphone Source Playback Route" },
> + { "Left Headphone Source", "DAC", "Left DAC" },
> + { "Left Headphone Source", "Mixer", "Left Mixer" },
> + { "Left Headphone Amp", NULL, "Left Headphone Source" },
> + { "Left Headphone Amp", NULL, "Headphone Amp" },
> + { "HP", NULL, "Left Headphone Amp" },
> +
> + { "Right Headphone Source", "DAC", "Right DAC" },
> + { "Right Headphone Source", "Mixer", "Right Mixer" },
> + { "Right Headphone Amp", NULL, "Right Headphone Source" },
> + { "Right Headphone Amp", NULL, "Headphone Amp" },
> + { "HP", NULL, "Right Headphone Amp" },
> +
> { "Headphone Amp", NULL, "cpvdd" },
> - { "HP", NULL, "Headphone Amp" },
>
> /* Microphone Routes */
> { "Mic1 Amplifier", NULL, "MIC1"},
> --
> 2.24.1
>
next prev parent reply other threads:[~2020-02-17 3:48 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 2:18 [PATCH 0/8] ASoC: sun50i-codec-analog: Cleanup and power management Samuel Holland
2020-02-17 2:18 ` [PATCH 1/8] ASoC: sun50i-codec-analog: Fix duplicate use of ADC enable bits Samuel Holland
2020-02-17 3:28 ` Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 2/8] ASoC: sun50i-codec-analog: Gate the amplifier clock during suspend Samuel Holland
2020-02-17 3:29 ` Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 3/8] ASoC: sun50i-codec-analog: Group and sort mixer routes Samuel Holland
2020-02-17 3:32 ` Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 4/8] ASoC: sun50i-codec-analog: Make headphone routes stereo Samuel Holland
2020-02-17 3:48 ` Chen-Yu Tsai [this message]
2020-02-17 3:57 ` Samuel Holland
2020-02-17 6:56 ` Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 5/8] ASoC: sun50i-codec-analog: Enable DAPM for headphone switch Samuel Holland
2020-02-17 7:17 ` Chen-Yu Tsai
2020-02-23 3:54 ` Samuel Holland
2020-02-17 2:18 ` [PATCH 6/8] ASoC: sun50i-codec-analog: Make line out routes stereo Samuel Holland
2020-02-17 7:19 ` Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 7/8] ASoC: sun50i-codec-analog: Enable DAPM for line out switch Samuel Holland
2020-02-17 7:20 ` Chen-Yu Tsai
2020-02-17 2:18 ` [PATCH 8/8] ASoC: sun50i-codec-analog: Enable DAPM for earpiece switch Samuel Holland
2020-02-17 7:33 ` Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAGb2v677p8u8_0jhcbN07QsyVc21dKJmeK6=rxLCbde+AOqreQ@mail.gmail.com' \
--to=wens@csie.org \
--cc=alsa-devel@alsa-project.org \
--cc=anarsoul@gmail.com \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luca@z3ntu.xyz \
--cc=mripard@kernel.org \
--cc=perex@perex.cz \
--cc=samuel@sholland.org \
--cc=tiwai@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).