From: Nícolas F. R. A. Prado Date: Thu, 8 Jun 2023 22:10:48 +0000 (-0400) Subject: ASoC: mediatek: mt8192-mt6359: Go back to old headphone pin name X-Git-Tag: v6.6.7~1940^2~32^2~104 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e352f31a863f47adfa54c76b633a21b1ed562387;p=platform%2Fkernel%2Flinux-starfive.git ASoC: mediatek: mt8192-mt6359: Go back to old headphone pin name This reverts commit cbbc0ec6dea09c ("ASoC: mediatek: mt8192-mt6359: Remove " Jack" from Headphone pin name"). That commit removed the " Jack" suffix with the reasoning that it is automatically added to the name of the kcontrol created, which is true, but this name is also used to look for the DAPM widget that will be toggled when the jack status is updated. Since the widget is still called "Headphone Jack" the jack can't link to the widget and the following error is shown: mt8192_mt6359 sound: ASoC: DAPM unknown pin Headphone It is not possible to also rename the headphone DAPM widget because its name is used by a switch kcontrol, "Headphone Jack Switch", both to link to the headphone widget and to assemble its name. This switch's name is referenced in the upstream UCM file, so renaming it would break userspace. Since the original commit didn't bring any benefit, besides sparing a few CPU cycles, simply revert it. Signed-off-by: Nícolas F. R. A. Prado Link: https://lore.kernel.org/r/20230608221050.217968-1-nfraprado@collabora.com Signed-off-by: Mark Brown --- diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c index 4e0d5bf..5e163e2 100644 --- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c +++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c @@ -46,7 +46,7 @@ struct mt8192_mt6359_priv { /* Headset jack detection DAPM pins */ static struct snd_soc_jack_pin mt8192_jack_pins[] = { { - .pin = "Headphone", + .pin = "Headphone Jack", .mask = SND_JACK_HEADPHONE, }, {