Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: fsl: Rename stream name of SAI DAI driver

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.
DAI names in AUDMIX are also updated accordingly.

Fixes: 15c958390460 ("ASoC: fsl_sai: Add separate DAI for transmitter and receiver")
Signed-off-by: Chancel Liu <chancel.liu@nxp.com>
Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com>
Link: https://patch.msgid.link/20250217010437.258621-1-chancel.liu@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Chancel Liu and committed by
Mark Brown
0da83ab0 5b0c02f9

+5 -5
+3 -3
sound/soc/fsl/fsl_sai.c
··· 994 994 { 995 995 .name = "sai-tx", 996 996 .playback = { 997 - .stream_name = "CPU-Playback", 997 + .stream_name = "SAI-Playback", 998 998 .channels_min = 1, 999 999 .channels_max = 32, 1000 - .rate_min = 8000, 1000 + .rate_min = 8000, 1001 1001 .rate_max = 2822400, 1002 1002 .rates = SNDRV_PCM_RATE_KNOT, 1003 1003 .formats = FSL_SAI_FORMATS, ··· 1007 1007 { 1008 1008 .name = "sai-rx", 1009 1009 .capture = { 1010 - .stream_name = "CPU-Capture", 1010 + .stream_name = "SAI-Capture", 1011 1011 .channels_min = 1, 1012 1012 .channels_max = 32, 1013 1013 .rate_min = 8000,
+2 -2
sound/soc/fsl/imx-audmix.c
··· 119 119 static const char *name[][3] = { 120 120 {"HiFi-AUDMIX-FE-0", "HiFi-AUDMIX-FE-1", "HiFi-AUDMIX-FE-2"}, 121 121 {"sai-tx", "sai-tx", "sai-rx"}, 122 - {"AUDMIX-Playback-0", "AUDMIX-Playback-1", "CPU-Capture"}, 123 - {"CPU-Playback", "CPU-Playback", "AUDMIX-Capture-0"}, 122 + {"AUDMIX-Playback-0", "AUDMIX-Playback-1", "SAI-Capture"}, 123 + {"SAI-Playback", "SAI-Playback", "AUDMIX-Capture-0"}, 124 124 }; 125 125 126 126 static int imx_audmix_probe(struct platform_device *pdev)