ASoC: Add multiple CPU DAI support in DAPM
DAPM handles DAIs during soc_dapm_stream_event() and during addition and creation of DAI widgets i.e., dapm_add_valid_dai_widget() and dapm_connect_dai_link_widgets(). Extend these functions to handle multiple cpu dai. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Shreyas NC <shreyas.nc@intel.com> Signed-off-by: Vinod Koul <vkoul@kernel.org> Link: https://lore.kernel.org/r/20200225133917.21314-5-yung-chuan.liao@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
6c4b13b51a
commit
de6214a336
|
@ -4361,9 +4361,19 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card,
|
|||
struct snd_soc_dai *codec_dai;
|
||||
int i;
|
||||
|
||||
for_each_rtd_codec_dai(rtd, i, codec_dai)
|
||||
dapm_add_valid_dai_widget(card, rtd,
|
||||
codec_dai, rtd->cpu_dais[0]);
|
||||
if (rtd->num_cpus == 1) {
|
||||
for_each_rtd_codec_dai(rtd, i, codec_dai)
|
||||
dapm_add_valid_dai_widget(card, rtd, codec_dai,
|
||||
rtd->cpu_dais[0]);
|
||||
} else if (rtd->num_codecs == rtd->num_cpus) {
|
||||
for_each_rtd_codec_dai(rtd, i, codec_dai)
|
||||
dapm_add_valid_dai_widget(card, rtd, codec_dai,
|
||||
rtd->cpu_dais[i]);
|
||||
} else {
|
||||
dev_err(card->dev,
|
||||
"N cpus to M codecs link is not supported yet\n");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void soc_dapm_dai_stream_event(struct snd_soc_dai *dai, int stream,
|
||||
|
@ -4424,9 +4434,11 @@ static void soc_dapm_stream_event(struct snd_soc_pcm_runtime *rtd, int stream,
|
|||
int event)
|
||||
{
|
||||
struct snd_soc_dai *codec_dai;
|
||||
struct snd_soc_dai *cpu_dai;
|
||||
int i;
|
||||
|
||||
soc_dapm_dai_stream_event(rtd->cpu_dai, stream, event);
|
||||
for_each_rtd_cpu_dai(rtd, i, cpu_dai)
|
||||
soc_dapm_dai_stream_event(rtd->cpu_dai, stream, event);
|
||||
for_each_rtd_codec_dai(rtd, i, codec_dai)
|
||||
soc_dapm_dai_stream_event(codec_dai, stream, event);
|
||||
|
||||
|
|
Loading…
Reference in New Issue