[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAGXv+5G3RjUOyGR2kqd1V-keQZLvBPaMmiW8BZgLGw6jcZe0nA@mail.gmail.com>
Date: Wed, 5 Jun 2024 16:15:20 +0800
From: Chen-Yu Tsai <wenst@...omium.org>
To: Hsin-Te Yuan <yuanhsinte@...omium.org>
Cc: Liam Girdwood <lgirdwood@...il.com>, Mark Brown <broonie@...nel.org>,
Jaroslav Kysela <perex@...ex.cz>, Takashi Iwai <tiwai@...e.com>,
Matthias Brugger <matthias.bgg@...il.com>,
AngeloGioacchino Del Regno <angelogioacchino.delregno@...labora.com>,
Alper Nebi Yasak <alpernebiyasak@...il.com>, linux-sound@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org
Subject: Re: [PATCH RFT] ASoC: mediatek: mt8183-da7219-max98357: Fix kcontrol
name collision
On Fri, May 31, 2024 at 4:38 PM Hsin-Te Yuan <yuanhsinte@...omium.org> wrote:
>
> Since "Headphone Switch" kcontrol name has already been used by da7219,
> rename the control name from "Headphone" to "Headphones" to prevent the
> colision. Also, this change makes kcontrol name align with the one in
^ collision
> mt8186-mt6366-da7219-max98357.c.
>
> Fixes: 9c7388baa2053 ("ASoC: mediatek: mt8183-da7219-max98357: Map missing jack kcontrols")
> Change-Id: I9ae69a4673cd04786b247cc514fdd20f878ef009
> Signed-off-by: Hsin-Te Yuan <yuanhsinte@...omium.org>
Otherwise,
Reviewed-by: Chen-Yu Tsai <wenst@...omium.org>
> ---
> This patch fix the kcontrol name collision in mt8183-da7219-max98357.c.
> Originally, the "Headphone" kcontrol is added to meet PulseAudio's and
> PipeWire's needs, but that patch was untested. Since I don't have
> either setup, I wonder if someone can test this patch.
> ---
> sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
> index acaf81fd6c9b..f848e14b091a 100644
> --- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
> +++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
> @@ -31,7 +31,7 @@ struct mt8183_da7219_max98357_priv {
>
> static struct snd_soc_jack_pin mt8183_da7219_max98357_jack_pins[] = {
> {
> - .pin = "Headphone",
> + .pin = "Headphones",
> .mask = SND_JACK_HEADPHONE,
> },
> {
> @@ -626,7 +626,7 @@ static struct snd_soc_codec_conf mt6358_codec_conf[] = {
> };
>
> static const struct snd_kcontrol_new mt8183_da7219_max98357_snd_controls[] = {
> - SOC_DAPM_PIN_SWITCH("Headphone"),
> + SOC_DAPM_PIN_SWITCH("Headphones"),
> SOC_DAPM_PIN_SWITCH("Headset Mic"),
> SOC_DAPM_PIN_SWITCH("Speakers"),
> SOC_DAPM_PIN_SWITCH("Line Out"),
> @@ -634,7 +634,7 @@ static const struct snd_kcontrol_new mt8183_da7219_max98357_snd_controls[] = {
>
> static const
> struct snd_soc_dapm_widget mt8183_da7219_max98357_dapm_widgets[] = {
> - SND_SOC_DAPM_HP("Headphone", NULL),
> + SND_SOC_DAPM_HP("Headphones", NULL),
> SND_SOC_DAPM_MIC("Headset Mic", NULL),
> SND_SOC_DAPM_SPK("Speakers", NULL),
> SND_SOC_DAPM_SPK("Line Out", NULL),
> @@ -680,7 +680,7 @@ static struct snd_soc_codec_conf mt8183_da7219_rt1015_codec_conf[] = {
> };
>
> static const struct snd_kcontrol_new mt8183_da7219_rt1015_snd_controls[] = {
> - SOC_DAPM_PIN_SWITCH("Headphone"),
> + SOC_DAPM_PIN_SWITCH("Headphones"),
> SOC_DAPM_PIN_SWITCH("Headset Mic"),
> SOC_DAPM_PIN_SWITCH("Left Spk"),
> SOC_DAPM_PIN_SWITCH("Right Spk"),
> @@ -689,7 +689,7 @@ static const struct snd_kcontrol_new mt8183_da7219_rt1015_snd_controls[] = {
>
> static const
> struct snd_soc_dapm_widget mt8183_da7219_rt1015_dapm_widgets[] = {
> - SND_SOC_DAPM_HP("Headphone", NULL),
> + SND_SOC_DAPM_HP("Headphones", NULL),
> SND_SOC_DAPM_MIC("Headset Mic", NULL),
> SND_SOC_DAPM_SPK("Left Spk", NULL),
> SND_SOC_DAPM_SPK("Right Spk", NULL),
>
> ---
> base-commit: 4a4be1ad3a6efea16c56615f31117590fd881358
> change-id: 20240531-da7219-2281085838a5
>
> Best regards,
> --
> Hsin-Te Yuan <yuanhsinte@...omium.org>
>
>
Powered by blists - more mailing lists