1 files changed, 105 insertions, 17 deletions

diff --git a/sound/soc/intel/boards/skl_nau88l25_max98357a.c b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
index ab7da9c304b2..72176b79a18d 100644
--- a/sound/soc/intel/boards/skl_nau88l25_max98357a.c
+++ b/sound/soc/intel/boards/skl_nau88l25_max98357a.c
@@ -22,6 +22,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include "../../codecs/nau8825.h"
+#include "../../codecs/hdac_hdmi.h"
 
 #define SKL_NUVOTON_CODEC_DAI   "nau8825-hifi"
 #define SKL_MAXIM_CODEC_DAI "HiFi"
@@ -29,6 +30,16 @@
 static struct snd_soc_jack skylake_headset;
 static struct snd_soc_card skylake_audio_card;
 
+enum {
+        SKL_DPCM_AUDIO_PB = 0,
+        SKL_DPCM_AUDIO_CP,
+        SKL_DPCM_AUDIO_REF_CP,
+        SKL_DPCM_AUDIO_DMIC_CP,
+        SKL_DPCM_AUDIO_HDMI1_PB,
+        SKL_DPCM_AUDIO_HDMI2_PB,
+        SKL_DPCM_AUDIO_HDMI3_PB,
+};
+
 static inline struct snd_soc_dai *skl_get_codec_dai(struct snd_soc_card *card)
 {
         struct snd_soc_pcm_runtime *rtd;
@@ -87,7 +98,6 @@ static const struct snd_soc_dapm_widget skylake_widgets[] = {
         SND_SOC_DAPM_MIC("Headset Mic", NULL),
         SND_SOC_DAPM_SPK("Spk", NULL),
         SND_SOC_DAPM_MIC("SoC DMIC", NULL),
-        SND_SOC_DAPM_SINK("WoV Sink"),
         SND_SOC_DAPM_SPK("DP", NULL),
         SND_SOC_DAPM_SPK("HDMI", NULL),
         SND_SOC_DAPM_SUPPLY("Platform Clock", SND_SOC_NOPM, 0, 0,
@@ -107,7 +117,6 @@ static const struct snd_soc_dapm_route skylake_map[] = {
         { "MIC", NULL, "Headset Mic" },
         { "DMic", NULL, "SoC DMIC" },
 
-        {"WoV Sink", NULL, "hwd_in sink"},
         {"HDMI", NULL, "hif5 Output"},
         {"DP", NULL, "hif6 Output"},
 
@@ -124,8 +133,14 @@ static const struct snd_soc_dapm_route skylake_map[] = {
         /* DMIC */
         { "dmic01_hifi", NULL, "DMIC01 Rx" },
         { "DMIC01 Rx", NULL, "DMIC AIF" },
-        { "hifi1", NULL, "iDisp Tx"},
-        { "iDisp Tx", NULL, "iDisp_out"},
+
+        { "hifi3", NULL, "iDisp3 Tx"},
+        { "iDisp3 Tx", NULL, "iDisp3_out"},
+        { "hifi2", NULL, "iDisp2 Tx"},
+        { "iDisp2 Tx", NULL, "iDisp2_out"},
+        { "hifi1", NULL, "iDisp1 Tx"},
+        { "iDisp1 Tx", NULL, "iDisp1_out"},
+
         { "Headphone Jack", NULL, "Platform Clock" },
         { "Headset Mic", NULL, "Platform Clock" },
 };
@@ -171,11 +186,31 @@ static int skylake_nau8825_codec_init(struct snd_soc_pcm_runtime *rtd)
         nau8825_enable_jack_detect(codec, &skylake_headset);
 
         snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");
-        snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "WoV Sink");
 
         return ret;
 }
 
+static int skylake_hdmi1_init(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_soc_dai *dai = rtd->codec_dai;
+
+        return hdac_hdmi_jack_init(dai, SKL_DPCM_AUDIO_HDMI1_PB);
+}
+
+static int skylake_hdmi2_init(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_soc_dai *dai = rtd->codec_dai;
+
+        return hdac_hdmi_jack_init(dai, SKL_DPCM_AUDIO_HDMI2_PB);
+}
+
+static int skylake_hdmi3_init(struct snd_soc_pcm_runtime *rtd)
+{
+        struct snd_soc_dai *dai = rtd->codec_dai;
+
+        return hdac_hdmi_jack_init(dai, SKL_DPCM_AUDIO_HDMI3_PB);
+}
+
 static int skylake_nau8825_fe_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_dapm_context *dapm;
@@ -318,7 +353,7 @@ static struct snd_soc_ops skylaye_refcap_ops = {
 /* skylake digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link skylake_dais[] = {
         /* Front End DAI links */
-        {
+        [SKL_DPCM_AUDIO_PB] = {
                 .name = "Skl Audio Port",
                 .stream_name = "Audio",
                 .cpu_dai_name = "System Pin",
@@ -333,7 +368,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
                 .dpcm_playback = 1,
                 .ops = &skylake_nau8825_fe_ops,
         },
-        {
+        [SKL_DPCM_AUDIO_CP] = {
                 .name = "Skl Audio Capture Port",
                 .stream_name = "Audio Record",
                 .cpu_dai_name = "System Pin",
@@ -347,7 +382,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
                 .dpcm_capture = 1,
                 .ops = &skylake_nau8825_fe_ops,
         },
-        {
+        [SKL_DPCM_AUDIO_REF_CP] = {
                 .name = "Skl Audio Reference cap",
                 .stream_name = "Wake on Voice",
                 .cpu_dai_name = "Reference Pin",
@@ -361,7 +396,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
                 .dynamic = 1,
                 .ops = &skylaye_refcap_ops,
         },
-        {
+        [SKL_DPCM_AUDIO_DMIC_CP] = {
                 .name = "Skl Audio DMIC cap",
                 .stream_name = "dmiccap",
                 .cpu_dai_name = "DMIC Pin",
@@ -374,15 +409,45 @@ static struct snd_soc_dai_link skylake_dais[] = {
                 .dynamic = 1,
                 .ops = &skylake_dmic_ops,
         },
-        {
-                .name = "Skl HDMI Port",
-                .stream_name = "Hdmi",
-                .cpu_dai_name = "HDMI Pin",
+        [SKL_DPCM_AUDIO_HDMI1_PB] = {
+                .name = "Skl HDMI Port1",
+                .stream_name = "Hdmi1",
+                .cpu_dai_name = "HDMI1 Pin",
+                .codec_name = "snd-soc-dummy",
+                .codec_dai_name = "snd-soc-dummy-dai",
+                .platform_name = "0000:00:1f.3",
+                .dpcm_playback = 1,
+                .init = NULL,
+                .trigger = {
+                        SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+                .nonatomic = 1,
+                .dynamic = 1,
+        },
+        [SKL_DPCM_AUDIO_HDMI2_PB] = {
+                .name = "Skl HDMI Port2",
+                .stream_name = "Hdmi2",
+                .cpu_dai_name = "HDMI2 Pin",
                 .codec_name = "snd-soc-dummy",
                 .codec_dai_name = "snd-soc-dummy-dai",
                 .platform_name = "0000:00:1f.3",
                 .dpcm_playback = 1,
                 .init = NULL,
+                .trigger = {
+                        SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+                .nonatomic = 1,
+                .dynamic = 1,
+        },
+        [SKL_DPCM_AUDIO_HDMI3_PB] = {
+                .name = "Skl HDMI Port3",
+                .stream_name = "Hdmi3",
+                .cpu_dai_name = "HDMI3 Pin",
+                .codec_name = "snd-soc-dummy",
+                .codec_dai_name = "snd-soc-dummy-dai",
+                .platform_name = "0000:00:1f.3",
+                .trigger = {
+                        SND_SOC_DPCM_TRIGGER_POST, SND_SOC_DPCM_TRIGGER_POST},
+                .dpcm_playback = 1,
+                .init = NULL,
                 .nonatomic = 1,
                 .dynamic = 1,
         },
@@ -407,7 +472,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
         {
                 /* SSP1 - Codec */
                 .name = "SSP1-Codec",
-                .be_id = 0,
+                .be_id = 1,
                 .cpu_dai_name = "SSP1 Pin",
                 .platform_name = "0000:00:1f.3",
                 .no_pcm = 1,
@@ -424,7 +489,7 @@ static struct snd_soc_dai_link skylake_dais[] = {
         },
         {
                 .name = "dmic01",
-                .be_id = 1,
+                .be_id = 2,
                 .cpu_dai_name = "DMIC01 Pin",
                 .codec_name = "dmic-codec",
                 .codec_dai_name = "dmic-hifi",
@@ -435,13 +500,36 @@ static struct snd_soc_dai_link skylake_dais[] = {
                 .no_pcm = 1,
         },
         {
-                .name = "iDisp",
+                .name = "iDisp1",
                 .be_id = 3,
-                .cpu_dai_name = "iDisp Pin",
+                .cpu_dai_name = "iDisp1 Pin",
                 .codec_name = "ehdaudio0D2",
                 .codec_dai_name = "intel-hdmi-hifi1",
                 .platform_name = "0000:00:1f.3",
                 .dpcm_playback = 1,
+                .init = skylake_hdmi1_init,
+                .no_pcm = 1,
+        },
+        {
+                .name = "iDisp2",
+                .be_id = 4,
+                .cpu_dai_name = "iDisp2 Pin",
+                .codec_name = "ehdaudio0D2",
+                .codec_dai_name = "intel-hdmi-hifi2",
+                .platform_name = "0000:00:1f.3",
+                .init = skylake_hdmi2_init,
+                .dpcm_playback = 1,
+                .no_pcm = 1,
+        },
+        {
+                .name = "iDisp3",
+                .be_id = 5,
+                .cpu_dai_name = "iDisp3 Pin",
+                .codec_name = "ehdaudio0D2",
+                .codec_dai_name = "intel-hdmi-hifi3",
+                .platform_name = "0000:00:1f.3",
+                .init = skylake_hdmi3_init,
+                .dpcm_playback = 1,
                 .no_pcm = 1,
         },
 };