ASoC: hdac_hda: Update hdac hda dai table to include intel-hdmi-hifi4

TGL supports more than three HDMI Dai's. So, update hdac_hda_dais table
to include 4th DAI.

Without this patch, we saw the below error in TGL DUT:
 sof_rt5682 tgl_max98357a_rt5682: ASoC: CODEC DAI intel-hdmi-hifi4 not

Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com>
Signed-off-by: Jairaj Arava <jairaj.arava@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191220171037.10689-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/hdac_hda.c b/sound/soc/codecs/hdac_hda.c
index 6803d39e09a5fed0bb922cf9d66a0eb2ca6de32c..4e0f4afe6ddc6ccf9a73a37db543564acc5ba9ba 100644 (file)
--- a/sound/soc/codecs/hdac_hda.c
+++ b/sound/soc/codecs/hdac_hda.c
@@ -164,6 +164,19 @@ static struct snd_soc_dai_driver hdac_hda_dais[] = {
                .sig_bits = 24,
        },
 },
+{
+       .id = HDAC_HDMI_3_DAI_ID,
+       .name = "intel-hdmi-hifi4",
+       .ops = &hdac_hda_dai_ops,
+       .playback = {
+               .stream_name    = "hifi4",
+               .channels_min   = 1,
+               .channels_max   = 32,
+               .rates          = STUB_HDMI_RATES,
+               .formats        = STUB_FORMATS,
+               .sig_bits = 24,
+       },
+},
 
 };
 
@@ -346,6 +359,9 @@ static struct hda_pcm *snd_soc_find_pcm_from_dai(struct hdac_hda_priv *hda_pvt,
        case HDAC_HDMI_2_DAI_ID:
                pcm_name = "HDMI 2";
                break;
+       case HDAC_HDMI_3_DAI_ID:
+               pcm_name = "HDMI 3";
+               break;
        default:
                dev_err(&hcodec->core.dev, "invalid dai id %d\n", dai->id);
                return NULL;

diff --git a/sound/soc/codecs/hdac_hda.h b/sound/soc/codecs/hdac_hda.h
index e145cec085b8f5f624e381884a537f073bee8e4f..598b07d9b6fea0fb7b7d642863fc11625e09015f 100644 (file)
--- a/sound/soc/codecs/hdac_hda.h
+++ b/sound/soc/codecs/hdac_hda.h
@@ -13,7 +13,8 @@ enum {
        HDAC_HDMI_0_DAI_ID,
        HDAC_HDMI_1_DAI_ID,
        HDAC_HDMI_2_DAI_ID,
-       HDAC_LAST_DAI_ID = HDAC_HDMI_2_DAI_ID,
+       HDAC_HDMI_3_DAI_ID,
+       HDAC_LAST_DAI_ID = HDAC_HDMI_3_DAI_ID,
 };
 
 struct hdac_hda_pcm {