[PATCH] ASoC: q6dsp6: q6afe-dai: add missing channels to MI2S DAIs

[Srinivas Kandagatla]

On 15/04/2020 16:00, Stephan Gerhold wrote:
> For some reason, the MI2S DAIs do not have channels_min/max defined.
> This means that snd_soc_dai_stream_valid() returns false,
> i.e. the DAIs have neither valid playback nor capture stream.
> 
> It's quite surprising that this ever worked correctly,
> but in 5.7-rc1 this is now failing badly: :)
> 
> Commit 0e9cf4c452ad ("ASoC: pcm: check if cpu-dai supports a given stream")
> introduced a check for snd_soc_dai_stream_valid() before calling
> hw_params(), which means that the q6i2s_hw_params() function
> was never called, eventually resulting in:
> 
>      qcom-q6afe aprsvc:q6afe:4:4: no line is assigned
> 
> ... even though "qcom,sd-lines" is set in the device tree.
> 
> Commit 9b5db059366a ("ASoC: soc-pcm: dpcm: Only allow playback/capture if supported")
> now even avoids creating PCM devices if the stream is not supported,
> which means that it is failing even earlier with e.g.:
> 
>      Primary MI2S: ASoC: no backend playback stream
> 
> Avoid all that trouble by adding channels_min/max for the MI2S DAIs.
> 
> Cc: Srinivas Kandagatla <srinivas.kandagatla at linaro.org>
> Fixes: 24c4cbcfac09 ("ASoC: qdsp6: q6afe: Add q6afe dai driver")
> Signed-off-by: Stephan Gerhold <stephan at gerhold.net>


Thanks for the patch,

Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla at linaro.org>



> ---
>   sound/soc/qcom/qdsp6/q6afe-dai.c | 16 ++++++++++++++++
>   1 file changed, 16 insertions(+)
> 
> diff --git a/sound/soc/qcom/qdsp6/q6afe-dai.c b/sound/soc/qcom/qdsp6/q6afe-dai.c
> index c1a7624eaf17..2a5302f1db98 100644
> --- a/sound/soc/qcom/qdsp6/q6afe-dai.c
> +++ b/sound/soc/qcom/qdsp6/q6afe-dai.c
> @@ -902,6 +902,8 @@ static struct snd_soc_dai_driver q6afe_dais[] = {
>   				 SNDRV_PCM_RATE_16000,
>   			.formats = SNDRV_PCM_FMTBIT_S16_LE |
>   				   SNDRV_PCM_FMTBIT_S24_LE,
> +			.channels_min = 1,
> +			.channels_max = 8,
>   			.rate_min =     8000,
>   			.rate_max =     48000,
>   		},
> @@ -917,6 +919,8 @@ static struct snd_soc_dai_driver q6afe_dais[] = {
>   				 SNDRV_PCM_RATE_16000,
>   			.formats = SNDRV_PCM_FMTBIT_S16_LE |
>   				   SNDRV_PCM_FMTBIT_S24_LE,
> +			.channels_min = 1,
> +			.channels_max = 8,
>   			.rate_min =     8000,
>   			.rate_max =     48000,
>   		},
> @@ -931,6 +935,8 @@ static struct snd_soc_dai_driver q6afe_dais[] = {
>   			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
>   				 SNDRV_PCM_RATE_16000,
>   			.formats = SNDRV_PCM_FMTBIT_S16_LE,
> +			.channels_min = 1,
> +			.channels_max = 8,
>   			.rate_min =     8000,
>   			.rate_max =     48000,
>   		},
> @@ -946,6 +952,8 @@ static struct snd_soc_dai_driver q6afe_dais[] = {
>   				 SNDRV_PCM_RATE_16000,
>   			.formats = SNDRV_PCM_FMTBIT_S16_LE |
>   				   SNDRV_PCM_FMTBIT_S24_LE,
> +			.channels_min = 1,
> +			.channels_max = 8,
>   			.rate_min =     8000,
>   			.rate_max =     48000,
>   		},
> @@ -960,6 +968,8 @@ static struct snd_soc_dai_driver q6afe_dais[] = {
>   			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
>   				 SNDRV_PCM_RATE_16000,
>   			.formats = SNDRV_PCM_FMTBIT_S16_LE,
> +			.channels_min = 1,
> +			.channels_max = 8,
>   			.rate_min =     8000,
>   			.rate_max =     48000,
>   		},
> @@ -975,6 +985,8 @@ static struct snd_soc_dai_driver q6afe_dais[] = {
>   				 SNDRV_PCM_RATE_16000,
>   			.formats = SNDRV_PCM_FMTBIT_S16_LE |
>   				   SNDRV_PCM_FMTBIT_S24_LE,
> +			.channels_min = 1,
> +			.channels_max = 8,
>   			.rate_min =     8000,
>   			.rate_max =     48000,
>   		},
> @@ -989,6 +1001,8 @@ static struct snd_soc_dai_driver q6afe_dais[] = {
>   			.rates = SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_8000 |
>   				 SNDRV_PCM_RATE_16000,
>   			.formats = SNDRV_PCM_FMTBIT_S16_LE,
> +			.channels_min = 1,
> +			.channels_max = 8,
>   			.rate_min =     8000,
>   			.rate_max =     48000,
>   		},
> @@ -1004,6 +1018,8 @@ static struct snd_soc_dai_driver q6afe_dais[] = {
>   				 SNDRV_PCM_RATE_16000,
>   			.formats = SNDRV_PCM_FMTBIT_S16_LE |
>   				   SNDRV_PCM_FMTBIT_S24_LE,
> +			.channels_min = 1,
> +			.channels_max = 8,
>   			.rate_min =     8000,
>   			.rate_max =     48000,
>   		},
>