[PATCH] Revert "ASoC: mediatek: mt8192-mt6359: Remove " Jack" from Headphone pin name"

[AngeloGioacchino Del Regno]

Il 09/06/23 00:10, Nícolas F. R. A. Prado ha scritto:
> This reverts commit cbbc0ec6dea09c815f1d1ef0abaf3f2ec89ff11f. 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 <nfraprado at collabora.com>
> 

That commit is made to bring consistency in naming across MediaTek (with
other) sound card drivers.. I'm not sure whether the right solution would
be to revert this one, or to make a small change in the UCM, counting that
we'd be able to add more shared names around, finally reducing the config
length by sharing actual configurations across various SoCs.

Any opinion?

Thanks,
Angelo

> ---
> 
>   sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
> index 4e0d5bf12b47..5e163e23a207 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,
>   	},
>   	{