Skip to content

Commit

Permalink
ASoC: fsl: Rename stream name of SAI DAI driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Chancel Liu authored and Mark Brown committed Feb 24, 2025
1 parent 5b0c02f commit 0da83ab
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions sound/soc/fsl/fsl_sai.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/fsl/imx-audmix.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ static const struct snd_soc_ops imx_audmix_be_ops = {
static const char *name[][3] = {
{"HiFi-AUDMIX-FE-0", "HiFi-AUDMIX-FE-1", "HiFi-AUDMIX-FE-2"},
{"sai-tx", "sai-tx", "sai-rx"},
{"AUDMIX-Playback-0", "AUDMIX-Playback-1", "CPU-Capture"},
{"CPU-Playback", "CPU-Playback", "AUDMIX-Capture-0"},
{"AUDMIX-Playback-0", "AUDMIX-Playback-1", "SAI-Capture"},
{"SAI-Playback", "SAI-Playback", "AUDMIX-Capture-0"},
};

static int imx_audmix_probe(struct platform_device *pdev)
Expand Down

0 comments on commit 0da83ab

Please sign in to comment.