]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: hdmi-codec: use SND_JACK_AVOUT as jack status
authorTerry Cheong <htcheong@chromium.org>
Fri, 13 Jun 2025 08:51:27 +0000 (16:51 +0800)
committerMark Brown <broonie@kernel.org>
Fri, 13 Jun 2025 11:23:56 +0000 (12:23 +0100)
Use SND_JACK_AVOUT as the mask to align with hdac_hdmi driver so that we
can determine HDMI/DP devices from event type.

Most drivers that uses hdmi-codec driver will not be affected since they
are creating jacks with SND_JACK_LINEOUT mask. They will still report
SND_JACK_LINEOUT when the jack status is updated with
snd_soc_jack_report.

Signed-off-by: Terry Cheong <htcheong@chromium.org>
Link: https://patch.msgid.link/20250613-hdmi-v1-1-665ba7ecd5e7@chromium.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/hdmi-codec.c

index 31121f9c18c91a7444420c7ad2a10fd5ea406dc3..e1933f733af1032bc6f8fef1de4356a346aabcfa 100644 (file)
@@ -943,7 +943,7 @@ static void hdmi_codec_jack_report(struct hdmi_codec_priv *hcp,
 {
        if (jack_status != hcp->jack_status) {
                if (hcp->jack)
-                       snd_soc_jack_report(hcp->jack, jack_status, SND_JACK_LINEOUT);
+                       snd_soc_jack_report(hcp->jack, jack_status, SND_JACK_AVOUT);
                hcp->jack_status = jack_status;
        }
 }
@@ -964,7 +964,7 @@ static void plugged_cb(struct device *dev, bool plugged)
                        else
                                snd_show_eld(dev, &hcp->eld_parsed);
                }
-               hdmi_codec_jack_report(hcp, SND_JACK_LINEOUT);
+               hdmi_codec_jack_report(hcp, SND_JACK_AVOUT);
        } else {
                hdmi_codec_jack_report(hcp, 0);
                memset(hcp->eld, 0, sizeof(hcp->eld));
@@ -984,7 +984,7 @@ static int hdmi_codec_set_jack(struct snd_soc_component *component,
                 * Report the initial jack status which may have been provided
                 * by the parent hdmi driver while the hpd hook was registered.
                 */
-               snd_soc_jack_report(jack, hcp->jack_status, SND_JACK_LINEOUT);
+               snd_soc_jack_report(jack, hcp->jack_status, SND_JACK_AVOUT);
 
                return 0;
        }