ASoC: Intel: bxt: Add jack port initialize in bxt_rt298 machine
authorJeeja KP <jeeja.kp@intel.com>
Fri, 17 Feb 2017 09:34:46 +0000 (15:04 +0530)
committerMark Brown <broonie@kernel.org>
Fri, 17 Feb 2017 11:24:13 +0000 (11:24 +0000)
After the pcm jack is created, create and initialize the pin switch
widget for each port. Pin switch is to enable/disable the pin when
monitor is connected/disconnected.

Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/bxt_rt298.c

index d5f53a6de041279cd2290bcf3322ac2cf4de5c7b..176c080a98187080c59881147c5c0617089ce936 100644 (file)
@@ -459,10 +459,12 @@ static int bxt_card_late_probe(struct snd_soc_card *card)
 {
        struct bxt_rt286_private *ctx = snd_soc_card_get_drvdata(card);
        struct bxt_hdmi_pcm *pcm;
+       struct snd_soc_codec *codec = NULL;
        int err, i = 0;
        char jack_name[NAME_SIZE];
 
        list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
+               codec = pcm->codec_dai->codec;
                snprintf(jack_name, sizeof(jack_name),
                        "HDMI/DP, pcm=%d Jack", pcm->device);
                err = snd_soc_card_jack_new(card, jack_name,
@@ -480,7 +482,10 @@ static int bxt_card_late_probe(struct snd_soc_card *card)
                i++;
        }
 
-       return 0;
+       if (!codec)
+               return -EINVAL;
+
+       return hdac_hdmi_jack_port_init(codec, &card->dapm);
 }