ASoC: Intel: sof_rt5682: use common module for HDMI-In link

Use intel_board module for HDMI-In DAI link initialization.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Balamurugan C <balamurugan.c@intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20231127152654.28204-24-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 22dd85129a515d9930d3aec68281f1d4b33e3a06..d353ad758c603d75bf9ca392913ab1aab9aefa5e 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -463,13 +463,6 @@ static struct snd_soc_ops sof_rt5682_ops = {
        .hw_params = sof_rt5682_hw_params,
 };
 
-static struct snd_soc_dai_link_component platform_component[] = {
-       {
-               /* name might be overridden during probe */
-               .name = "0000:00:1f.3"
-       }
-};
-
 static int sof_card_late_probe(struct snd_soc_card *card)
 {
        struct sof_card_private *ctx = snd_soc_card_get_drvdata(card);
@@ -576,18 +569,14 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec codec_type,
                          int ssp_amp, int dmic_be_num, int hdmi_num,
                          bool idisp_codec, bool is_legacy_cpu)
 {
-       struct snd_soc_dai_link_component *cpus;
        struct snd_soc_dai_link *links;
        int i;
        int id = 0;
        int ret;
-       int hdmi_id_offset = 0;
 
        links = devm_kcalloc(dev, sof_audio_card_rt5682.num_links,
                            sizeof(struct snd_soc_dai_link), GFP_KERNEL);
-       cpus = devm_kcalloc(dev, sof_audio_card_rt5682.num_links,
-                           sizeof(struct snd_soc_dai_link_component), GFP_KERNEL);
-       if (!links || !cpus)
+       if (!links)
                goto devm_err;
 
        /* codec SSP */
@@ -735,22 +724,11 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec codec_type,
                int port = 0;
 
                for_each_set_bit(port, &hdmi_in_ssp, 32) {
-                       links[id].cpus = &cpus[id];
-                       links[id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
-                                                                 "SSP%d Pin", port);
-                       if (!links[id].cpus->dai_name)
-                               return NULL;
-                       links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-HDMI", port);
-                       if (!links[id].name)
+                       ret = sof_intel_board_set_hdmi_in_link(dev, &links[id],
+                                                              id, port);
+                       if (ret)
                                return NULL;
-                       links[id].id = id + hdmi_id_offset;
-                       links[id].codecs = &snd_soc_dummy_dlc;
-                       links[id].num_codecs = 1;
-                       links[id].platforms = platform_component;
-                       links[id].num_platforms = ARRAY_SIZE(platform_component);
-                       links[id].dpcm_capture = 1;
-                       links[id].no_pcm = 1;
-                       links[id].num_cpus = 1;
+
                        id++;
                }
        }
@@ -831,7 +809,10 @@ static int sof_audio_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "sof_rt5682_quirk = %lx\n", sof_rt5682_quirk);
 
-       /* port number of peripherals attached to ssp interface */
+       /* port number/mask of peripherals attached to ssp interface */
+       ctx->ssp_mask_hdmi_in = (sof_rt5682_quirk & SOF_SSP_HDMI_CAPTURE_PRESENT_MASK) >>
+                       SOF_NO_OF_HDMI_CAPTURE_SSP_SHIFT;
+
        ctx->ssp_bt = (sof_rt5682_quirk & SOF_BT_OFFLOAD_SSP_MASK) >>
                        SOF_BT_OFFLOAD_SSP_SHIFT;