diff options
| author | Ranjani Sridharan | 2019-06-12 19:23:35 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-06-17 14:36:53 +0200 |
| commit | 1b7e1956860d7566325502651c6bf14f115cd91d (patch) | |
| tree | 1708785f74c5c7c544c7c2b5ff58fcf4cab8ef33 /sound/soc/sof | |
| parent | ASoC: SOF: Intel: hda: add new macro hstream_to_sof_hda_stream() (diff) | |
| download | kernel-qcow2-linux-1b7e1956860d7566325502651c6bf14f115cd91d.tar.gz kernel-qcow2-linux-1b7e1956860d7566325502651c6bf14f115cd91d.tar.xz kernel-qcow2-linux-1b7e1956860d7566325502651c6bf14f115cd91d.zip | |
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>
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/sof-priv.h | 1 | ||||
| -rw-r--r-- | sound/soc/sof/topology.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h index 8760a4694d8f..8c3ac149bbb9 100644 --- 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 aaf459af89d0..178256e338b1 100644 --- 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, |