Skip to content

Commit 0da83ab

Browse files
Chancel Liubroonie
authored andcommitted
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: 15c9583 ("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>
1 parent 5b0c02f commit 0da83ab

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

sound/soc/fsl/fsl_sai.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -994,10 +994,10 @@ static struct snd_soc_dai_driver fsl_sai_dai_template[] = {
994994
{
995995
.name = "sai-tx",
996996
.playback = {
997-
.stream_name = "CPU-Playback",
997+
.stream_name = "SAI-Playback",
998998
.channels_min = 1,
999999
.channels_max = 32,
1000-
.rate_min = 8000,
1000+
.rate_min = 8000,
10011001
.rate_max = 2822400,
10021002
.rates = SNDRV_PCM_RATE_KNOT,
10031003
.formats = FSL_SAI_FORMATS,
@@ -1007,7 +1007,7 @@ static struct snd_soc_dai_driver fsl_sai_dai_template[] = {
10071007
{
10081008
.name = "sai-rx",
10091009
.capture = {
1010-
.stream_name = "CPU-Capture",
1010+
.stream_name = "SAI-Capture",
10111011
.channels_min = 1,
10121012
.channels_max = 32,
10131013
.rate_min = 8000,

sound/soc/fsl/imx-audmix.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ static const struct snd_soc_ops imx_audmix_be_ops = {
119119
static const char *name[][3] = {
120120
{"HiFi-AUDMIX-FE-0", "HiFi-AUDMIX-FE-1", "HiFi-AUDMIX-FE-2"},
121121
{"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"},
124124
};
125125

126126
static int imx_audmix_probe(struct platform_device *pdev)

0 commit comments

Comments
 (0)