From: Jeeja KP jeeja.kp@intel.com
soc_link_dai_widgets() creates codec-codec loopback link which allows DPCM to trigger these links and program the parameters for these links These links are:
Codec1 Tx (Pb) ----------> Rx Codec2 (Cap) Codec2 Tx (Cap) <---------- Tx Codec1 (Pb)
But as we try to model a CPU based loops for non host links like modem to codec loop, the above mapping gets wrong as:
CPU Tx (Pb) -----------> Codec Tx (Pb) CPU Rx (Cap) <----------- Codec Rx (Cap)
So we add a new flag to handle above scenario and link widgets as depecited above
Signed-off-by: Jeeja KP jeeja.kp@intel.com Signed-off-by: Vinod Koul vinod.koul@intel.com --- include/sound/soc.h | 3 +++ sound/soc/soc-core.c | 20 ++++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h index a8b4b9c8b1d2..e93927789d98 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -992,6 +992,9 @@ struct snd_soc_dai_link { const struct snd_soc_pcm_stream *params; unsigned int num_params;
+ /* flag to create cpu based loopback link */ + unsigned int cpu_loopback:1; + unsigned int dai_fmt; /* format to set on init */
enum snd_soc_dpcm_trigger trigger[2]; /* trigger type for DPCM */ diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index d5e0bcbafb70..40077fbd2495 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -1290,8 +1290,14 @@ static int soc_link_dai_widgets(struct snd_soc_card *card, dev_warn(card->dev, "ASoC: Multiple codecs not supported yet\n");
/* link the DAI widgets */ - sink = codec_dai->playback_widget; - source = cpu_dai->capture_widget; + if (!dai_link->cpu_loopback) { + sink = codec_dai->playback_widget; + source = cpu_dai->capture_widget; + } else { + sink = codec_dai->playback_widget; + source = cpu_dai->playback_widget; + } + if (sink && source) { ret = snd_soc_dapm_new_pcm(card, dai_link->params, dai_link->num_params, @@ -1303,8 +1309,14 @@ static int soc_link_dai_widgets(struct snd_soc_card *card, } }
- sink = cpu_dai->playback_widget; - source = codec_dai->capture_widget; + if (!dai_link->cpu_loopback) { + sink = cpu_dai->playback_widget; + source = codec_dai->capture_widget; + } else { + sink = cpu_dai->capture_widget; + source = codec_dai->capture_widget; + } + if (sink && source) { ret = snd_soc_dapm_new_pcm(card, dai_link->params, dai_link->num_params,