Unverified Commit 97d86136 authored by Hsin-Te Yuan's avatar Hsin-Te Yuan Committed by Mark Brown
Browse files

ASoC: mediatek: mt8183-da7219-max98357: Fix kcontrol name collision 



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
mt8186-mt6366-da7219-max98357.c.

Fixes: 9c7388ba ("ASoC: mediatek: mt8183-da7219-max98357: Map missing jack kcontrols")
Change-Id: I9ae69a4673cd04786b247cc514fdd20f878ef009
Signed-off-by: default avatarHsin-Te Yuan <yuanhsinte@chromium.org>
Reviewed-by: default avatarChen-Yu Tsai <wenst@chromium.org>
Link: https://msgid.link/r/20240531-da7219-v1-1-ac3343f3ae6a@chromium.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ccd8d753

sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c

+5 −5
Original line number Diff line number Diff line
@@ -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),