ASoC: fsl_sai: Rename stream name of dai driver

[PATCH] ASoC: fsl_sai: Rename stream name of dai driver

Posted by Chancel Liu 11 months, 4 weeks ago

If stream names of dai driver are duplicated there'll be warnings when
machine driver tries to add widgets on a route:

[    8.831335] fsl-asoc-card sound-wm8960: ASoC: sink widget CPU-Playback overwritten
[    8.839917] fsl-asoc-card sound-wm8960: ASoC: source widget CPU-Capture overwritten

Use different stream names to avoid such warnings.

Fixes: 15c958390460 ("ASoC: fsl_sai: Add separate DAI for transmitter and receiver")
Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
---
 sound/soc/fsl/fsl_sai.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index c4eb87c5d39e..9f33dd11d47f 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -994,10 +994,10 @@ static struct snd_soc_dai_driver fsl_sai_dai_template[] = {
 	{
 		.name = "sai-tx",
 		.playback = {
-			.stream_name = "CPU-Playback",
+			.stream_name = "SAI-Playback",
 			.channels_min = 1,
 			.channels_max = 32,
-				.rate_min = 8000,
+			.rate_min = 8000,
 			.rate_max = 2822400,
 			.rates = SNDRV_PCM_RATE_KNOT,
 			.formats = FSL_SAI_FORMATS,
@@ -1007,7 +1007,7 @@ static struct snd_soc_dai_driver fsl_sai_dai_template[] = {
 	{
 		.name = "sai-rx",
 		.capture = {
-			.stream_name = "CPU-Capture",
+			.stream_name = "SAI-Capture",
 			.channels_min = 1,
 			.channels_max = 32,
 			.rate_min = 8000,
-- 
2.47.1

Re: [PATCH] ASoC: fsl_sai: Rename stream name of dai driver

Posted by Shengjiu Wang 11 months, 4 weeks ago

On Fri, Feb 14, 2025 at 3:18 PM Chancel Liu <chancel.liu@nxp.com> wrote:
>
> If stream names of dai driver are duplicated there'll be warnings when
> machine driver tries to add widgets on a route:
>
> [    8.831335] fsl-asoc-card sound-wm8960: ASoC: sink widget CPU-Playback overwritten
> [    8.839917] fsl-asoc-card sound-wm8960: ASoC: source widget CPU-Capture overwritten
>
> Use different stream names to avoid such warnings.

Only this change should cause issue for imx-audmix driver.

Best regards
Shengjiu Wang

>
> Fixes: 15c958390460 ("ASoC: fsl_sai: Add separate DAI for transmitter and receiver")
> Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
> ---
>  sound/soc/fsl/fsl_sai.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
> index c4eb87c5d39e..9f33dd11d47f 100644
> --- a/sound/soc/fsl/fsl_sai.c
> +++ b/sound/soc/fsl/fsl_sai.c
> @@ -994,10 +994,10 @@ static struct snd_soc_dai_driver fsl_sai_dai_template[] = {
>         {
>                 .name = "sai-tx",
>                 .playback = {
> -                       .stream_name = "CPU-Playback",
> +                       .stream_name = "SAI-Playback",
>                         .channels_min = 1,
>                         .channels_max = 32,
> -                               .rate_min = 8000,
> +                       .rate_min = 8000,
>                         .rate_max = 2822400,
>                         .rates = SNDRV_PCM_RATE_KNOT,
>                         .formats = FSL_SAI_FORMATS,
> @@ -1007,7 +1007,7 @@ static struct snd_soc_dai_driver fsl_sai_dai_template[] = {
>         {
>                 .name = "sai-rx",
>                 .capture = {
> -                       .stream_name = "CPU-Capture",
> +                       .stream_name = "SAI-Capture",
>                         .channels_min = 1,
>                         .channels_max = 32,
>                         .rate_min = 8000,
> --
> 2.47.1
>