ASoC: SOF: nocodec: modify DAI link definitions

The ignore_machine field in the component driver is used to
ignore the FE DAI links defined in the machine driver,
override BE fixups and set the stream names for the
DAI links defined in the machine driver. This is required
to make SOF compatible with the legacy machine drivers.

In the case of the nocodec machine driver in SOF, there is
no need to rely upon this ignore_machine logic in the core.
Modify the machine driver to set DAI link stream names and the
BE hw_params_fixup callback appropriately.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20201120141653.2160134-1-kai.vehmanen@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/sof.h b/include/sound/sof.h
index 9aa055289dcce4156835925553e89a25d6168617..646a655c3c6bf00c7d66a01df1a8688bbd77d7ba 100644 (file)
--- a/include/sound/sof.h
+++ b/include/sound/sof.h
@@ -100,6 +100,8 @@ struct sof_dev_desc {
        const struct snd_sof_dsp_ops *ops;
 };
 
-int sof_nocodec_setup(struct device *dev,
-                     const struct snd_sof_dsp_ops *ops);
+int sof_nocodec_setup(struct device *dev, const struct snd_sof_dsp_ops *ops,
+                     int (*pcm_dai_link_fixup)(struct snd_soc_pcm_runtime *rtd,
+                                               struct snd_pcm_hw_params *params));
+
 #endif

diff --git a/sound/soc/sof/nocodec.c b/sound/soc/sof/nocodec.c
index 9e922df6a710186532615b141e923fef8e57ec5e..3b9bb2e83a8693a0698bf38abc0f12c8c91ff94d 100644 (file)
--- a/sound/soc/sof/nocodec.c
+++ b/sound/soc/sof/nocodec.c
@@ -10,17 +10,21 @@
 
 #include <linux/module.h>
 #include <sound/sof.h>
+#include "sof-audio.h"
 #include "sof-priv.h"
 
 static struct snd_soc_card sof_nocodec_card = {
        .name = "nocodec", /* the sof- prefix is added by the core */
+       .topology_shortname = "sof-nocodec",
        .owner = THIS_MODULE
 };
 
 static int sof_nocodec_bes_setup(struct device *dev,
                                 const struct snd_sof_dsp_ops *ops,
                                 struct snd_soc_dai_link *links,
-                                int link_num, struct snd_soc_card *card)
+                                int link_num, struct snd_soc_card *card,
+                                int (*pcm_dai_link_fixup)(struct snd_soc_pcm_runtime *rtd,
+                                                          struct snd_pcm_hw_params *params))
 {
        struct snd_soc_dai_link_component *dlc;
        int i;
@@ -39,6 +43,8 @@ static int sof_nocodec_bes_setup(struct device *dev,
                if (!links[i].name)
                        return -ENOMEM;
 
+               links[i].stream_name = links[i].name;
+
                links[i].cpus = &dlc[0];
                links[i].codecs = &dlc[1];
                links[i].platforms = &dlc[2];
@@ -57,6 +63,8 @@ static int sof_nocodec_bes_setup(struct device *dev,
                        links[i].dpcm_playback = 1;
                if (ops->drv[i].capture.channels_min)
                        links[i].dpcm_capture = 1;
+
+               links[i].be_hw_params_fixup = pcm_dai_link_fixup;
        }
 
        card->dai_link = links;
@@ -65,8 +73,9 @@ static int sof_nocodec_bes_setup(struct device *dev,
        return 0;
 }
 
-int sof_nocodec_setup(struct device *dev,
-                     const struct snd_sof_dsp_ops *ops)
+int sof_nocodec_setup(struct device *dev, const struct snd_sof_dsp_ops *ops,
+                     int (*pcm_dai_link_fixup)(struct snd_soc_pcm_runtime *rtd,
+                                               struct snd_pcm_hw_params *params))
 {
        struct snd_soc_dai_link *links;
 
@@ -77,7 +86,7 @@ int sof_nocodec_setup(struct device *dev,
                return -ENOMEM;
 
        return sof_nocodec_bes_setup(dev, ops, links, ops->num_drv,
-                                    &sof_nocodec_card);
+                                    &sof_nocodec_card, pcm_dai_link_fixup);
 }
 EXPORT_SYMBOL(sof_nocodec_setup);
 
@@ -86,6 +95,7 @@ static int sof_nocodec_probe(struct platform_device *pdev)
        struct snd_soc_card *card = &sof_nocodec_card;
 
        card->dev = &pdev->dev;
+       card->topology_shortname_created = true;
 
        return devm_snd_soc_register_card(&pdev->dev, card);
 }

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index 37d12162e448dbb8aabe0279b9aa0629a16f9571..0dc39fbcd81de54a01e52814ee230224f28b7b0d 100644 (file)
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -620,8 +620,7 @@ capture:
 }
 
 /* fixup the BE DAI link to match any values from topology */
-static int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd,
-                                 struct snd_pcm_hw_params *params)
+int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params)
 {
        struct snd_interval *rate = hw_param_interval(params,
                        SNDRV_PCM_HW_PARAM_RATE);

diff --git a/sound/soc/sof/sof-audio.c b/sound/soc/sof/sof-audio.c
index 9a8ce25a8fc8777f0bf1f64921e5964ddafe6c7b..3277489fee5e212903bd62891e8362ee0ee78fac 100644 (file)
--- a/sound/soc/sof/sof-audio.c
+++ b/sound/soc/sof/sof-audio.c
@@ -468,7 +468,7 @@ int sof_machine_check(struct snd_sof_dev *sdev)
        mach->drv_name = "sof-nocodec";
        sof_pdata->tplg_filename = desc->nocodec_tplg_filename;
 
-       ret = sof_nocodec_setup(sdev->dev, desc->ops);
+       ret = sof_nocodec_setup(sdev->dev, desc->ops, sof_pcm_dai_link_fixup);
        if (ret < 0)
                return ret;
 

diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h
index ddcfd46617f8ea5a0a69db34aac83eb667578de3..d00a918b6f39c227c50e2378e25fd261e4768fc5 100644 (file)
--- a/sound/soc/sof/sof-audio.h
+++ b/sound/soc/sof/sof-audio.h
@@ -214,6 +214,9 @@ int snd_sof_ipc_set_get_comp_data(struct snd_sof_control *scontrol,
                                  enum sof_ipc_ctrl_cmd ctrl_cmd,
                                  bool send);
 
+/* DAI link fixup */
+int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, struct snd_pcm_hw_params *params);
+
 /* PM */
 int sof_restore_pipelines(struct device *dev);
 int sof_set_hw_params_upon_resume(struct device *dev);