Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: mediatek: Use SND_JACK_AVOUT for HDMI/DP jacks

The SND_JACK_AVOUT is a more specific jack type for HDMI and DisplayPort.
Updatae the MediaTek drivers to use such jack type, allowing system to
determine the device type based on jack event.

Signed-off-by: Terry Cheong <htcheong@chromium.org>
Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://patch.msgid.link/20250723-mtk-hdmi-v1-1-4ff945eb6136@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Terry Cheong and committed by
Mark Brown
8ed2dca4 e83dcd13

+11 -11
+1 -1
sound/soc/mediatek/mt8173/mt8173-rt5650.c
··· 159 159 { 160 160 int ret; 161 161 162 - ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, 162 + ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_AVOUT, 163 163 &mt8173_rt5650_hdmi_jack); 164 164 if (ret) 165 165 return ret;
+1 -1
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
··· 378 378 snd_soc_card_get_drvdata(rtd->card); 379 379 int ret; 380 380 381 - ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, 381 + ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_AVOUT, 382 382 &priv->hdmi_jack); 383 383 if (ret) 384 384 return ret;
+1 -1
sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
··· 383 383 snd_soc_card_get_drvdata(rtd->card); 384 384 int ret; 385 385 386 - ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, 386 + ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_AVOUT, 387 387 &priv->hdmi_jack); 388 388 if (ret) 389 389 return ret;
+1 -1
sound/soc/mediatek/mt8186/mt8186-mt6366.c
··· 362 362 return ret; 363 363 } 364 364 365 - ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, jack); 365 + ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_AVOUT, jack); 366 366 if (ret) { 367 367 dev_err(rtd->dev, "HDMI Jack creation failed: %d\n", ret); 368 368 return ret;
+4 -4
sound/soc/mediatek/mt8188/mt8188-mt6359.c
··· 250 250 static struct snd_soc_jack_pin mt8188_hdmi_jack_pins[] = { 251 251 { 252 252 .pin = "HDMI", 253 - .mask = SND_JACK_LINEOUT, 253 + .mask = SND_JACK_AVOUT, 254 254 }, 255 255 }; 256 256 257 257 static struct snd_soc_jack_pin mt8188_dp_jack_pins[] = { 258 258 { 259 259 .pin = "DP", 260 - .mask = SND_JACK_LINEOUT, 260 + .mask = SND_JACK_AVOUT, 261 261 }, 262 262 }; 263 263 ··· 638 638 int ret = 0; 639 639 640 640 ret = snd_soc_card_jack_new_pins(rtd->card, "HDMI Jack", 641 - SND_JACK_LINEOUT, jack, 641 + SND_JACK_AVOUT, jack, 642 642 mt8188_hdmi_jack_pins, 643 643 ARRAY_SIZE(mt8188_hdmi_jack_pins)); 644 644 if (ret) { ··· 663 663 struct snd_soc_component *component = snd_soc_rtd_to_codec(rtd, 0)->component; 664 664 int ret = 0; 665 665 666 - ret = snd_soc_card_jack_new_pins(rtd->card, "DP Jack", SND_JACK_LINEOUT, 666 + ret = snd_soc_card_jack_new_pins(rtd->card, "DP Jack", SND_JACK_AVOUT, 667 667 jack, mt8188_dp_jack_pins, 668 668 ARRAY_SIZE(mt8188_dp_jack_pins)); 669 669 if (ret) {
+1 -1
sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
··· 368 368 snd_soc_rtd_to_codec(rtd, 0)->component; 369 369 int ret; 370 370 371 - ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, jack); 371 + ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_AVOUT, jack); 372 372 if (ret) { 373 373 dev_err(rtd->dev, "HDMI Jack creation failed: %d\n", ret); 374 374 return ret;
+2 -2
sound/soc/mediatek/mt8195/mt8195-mt6359.c
··· 360 360 snd_soc_rtd_to_codec(rtd, 0)->component; 361 361 int ret; 362 362 363 - ret = snd_soc_card_jack_new(rtd->card, "DP Jack", SND_JACK_LINEOUT, jack); 363 + ret = snd_soc_card_jack_new(rtd->card, "DP Jack", SND_JACK_AVOUT, jack); 364 364 if (ret) 365 365 return ret; 366 366 ··· 375 375 snd_soc_rtd_to_codec(rtd, 0)->component; 376 376 int ret; 377 377 378 - ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, jack); 378 + ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_AVOUT, jack); 379 379 if (ret) 380 380 return ret; 381 381