|
@@ -33,6 +33,7 @@
|
|
|
#define QUAD_CHANNEL 4
|
|
|
|
|
|
static struct snd_soc_jack broxton_headset;
|
|
|
+static struct snd_soc_jack broxton_hdmi[3];
|
|
|
|
|
|
struct bxt_hdmi_pcm {
|
|
|
struct list_head head;
|
|
@@ -517,16 +518,30 @@ static struct snd_soc_dai_link broxton_dais[] = {
|
|
|
},
|
|
|
};
|
|
|
|
|
|
+#define NAME_SIZE 32
|
|
|
static int bxt_card_late_probe(struct snd_soc_card *card)
|
|
|
{
|
|
|
struct bxt_card_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;
|