ASoC: SOF: topology: add cpu_dai_name for DAIs

Add the cpu_dai_name member to snd_sof_dai and save the
cpu_dai_name while setting the DAI config.

The internal SOF representation will have to change at a later point
as well when we have multiple CPU dais.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
index 8760a4694d8f866ce9ba7c8018c1a105d57d8e7a..8c3ac149bbb9f882888a8da14c7b2df7f1e1d8ec 100644 (file)
--- a/sound/soc/sof/sof-priv.h
+++ b/sound/soc/sof/sof-priv.h
@@ -337,6 +337,7 @@ struct snd_sof_route {
 struct snd_sof_dai {
        struct snd_sof_dev *sdev;
        const char *name;
+       const char *cpu_dai_name;
 
        struct sof_ipc_comp_dai comp_dai;
        struct sof_ipc_dai_config *dai_config;

diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
index aaf459af89d07b1f50d7c6730299ae3d9528380c..178256e338b19e2be7c1bfbc902c7acd20545551 100644 (file)
--- a/sound/soc/sof/topology.c
+++ b/sound/soc/sof/topology.c
@@ -2360,6 +2360,9 @@ static int sof_set_dai_config(struct snd_sof_dev *sdev, u32 size,
                        if (!dai->dai_config)
                                return -ENOMEM;
 
+                       /* set cpu_dai_name */
+                       dai->cpu_dai_name = link->cpus->dai_name;
+
                        found = 1;
                }
        }
@@ -2624,6 +2627,8 @@ static int sof_link_hda_process(struct snd_sof_dev *sdev,
                        if (!sof_dai->dai_config)
                                return -ENOMEM;
 
+                       sof_dai->cpu_dai_name = link->cpus->dai_name;
+
                        /* send message to DSP */
                        ret = sof_ipc_tx_message(sdev->ipc,
                                                 config->hdr.cmd, config, size,