ASoC: Intel: bxt: Create ASoC jack for hdmi in bxt_rt298 machine
authorJeeja KP <jeeja.kp@intel.com>
Tue, 7 Feb 2017 13:39:53 +0000 (19:09 +0530)
committerMark Brown <broonie@kernel.org>
Thu, 16 Feb 2017 18:55:59 +0000 (18:55 +0000)
Creates ASoC jack for HDMI PCM and calls hdmi codec API to initialize
jack in bxt_rt298.c machine

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

index 09be868833d1619e23a2027392d77f77cb0097bc..d5f53a6de041279cd2290bcf3322ac2cf4de5c7b 100644 (file)
@@ -28,6 +28,7 @@
 
 /* Headset jack detection DAPM pins */
 static struct snd_soc_jack broxton_headset;
+static struct snd_soc_jack broxton_hdmi[3];
 
 struct bxt_hdmi_pcm {
        struct list_head head;
@@ -453,16 +454,30 @@ static struct snd_soc_dai_link broxton_rt298_dais[] = {
        },
 };
 
+#define NAME_SIZE      32
 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;
-       int err;
+       int err, i = 0;
+       char jack_name[NAME_SIZE];
 
        list_for_each_entry(pcm, &ctx->hdmi_pcm_list, head) {
-               err = hdac_hdmi_jack_init(pcm->codec_dai, pcm->device);
+               snprintf(jack_name, sizeof(jack_name),
+                       "HDMI/DP, pcm=%d Jack", pcm->device);
+               err = snd_soc_card_jack_new(card, jack_name,
+                                       SND_JACK_AVOUT, &broxton_hdmi[i],
+                                       NULL, 0);
+
+               if (err)
+                       return err;
+
+               err = hdac_hdmi_jack_init(pcm->codec_dai, pcm->device,
+                                               &broxton_hdmi[i]);
                if (err < 0)
                        return err;
+
+               i++;
        }
 
        return 0;