ASoC: dpcm: extend channel merging to the backend cpu dai

Extend dpcm_merge_chan to also check backend cpu dai channels
capabilities. Apply the same policy as soc_pcm_init_runtime_hw() for
multicodec links and only check cpu dai in this case.

Cc: Jiada Wang <jiada_wang@mentor.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 63f96cde046a9aef5e192b9b599b46581f7d5987..6ee4131941dfcd23b267306122af1f1bcf4670ea 100644 (file)
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -1736,12 +1736,26 @@ static void dpcm_runtime_base_chan(struct snd_pcm_substream *substream,
 
        list_for_each_entry(dpcm, &fe->dpcm[stream].be_clients, list_be) {
                struct snd_soc_pcm_runtime *be = dpcm->be;
+               struct snd_soc_dai_driver *cpu_dai_drv =  be->cpu_dai->driver;
                struct snd_soc_dai_driver *codec_dai_drv;
                struct snd_soc_pcm_stream *codec_stream;
-               int i;
+               struct snd_soc_pcm_stream *cpu_stream;
+
+               if (stream == SNDRV_PCM_STREAM_PLAYBACK)
+                       cpu_stream = &cpu_dai_drv->playback;
+               else
+                       cpu_stream = &cpu_dai_drv->capture;
+
+               *channels_min = max(*channels_min, cpu_stream->channels_min);
+               *channels_max = min(*channels_max, cpu_stream->channels_max);
+
+               /*
+                * chan min/max cannot be enforced if there are multiple CODEC
+                * DAIs connected to a single CPU DAI, use CPU DAI's directly
+                */
+               if (be->num_codecs == 1) {
+                       codec_dai_drv = be->codec_dais[0]->driver;
 
-               for (i = 0; i < be->num_codecs; i++) {
-                       codec_dai_drv = be->codec_dais[i]->driver;
                        if (stream == SNDRV_PCM_STREAM_PLAYBACK)
                                codec_stream = &codec_dai_drv->playback;
                        else