sound/soc/fsl/fsl_sai.c | 6 +++--- sound/soc/fsl/imx-audmix.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
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>
---
- changes in v3
Squash two fix patches in one commit
sound/soc/fsl/fsl_sai.c | 6 +++---
sound/soc/fsl/imx-audmix.c | 4 ++--
2 files changed, 5 insertions(+), 5 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,
diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c
index 50ecc5f51100..dac5d4ddacd6 100644
--- a/sound/soc/fsl/imx-audmix.c
+++ b/sound/soc/fsl/imx-audmix.c
@@ -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)
--
2.47.1On Mon, 17 Feb 2025 10:04:37 +0900, Chancel Liu 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.
> DAI names in AUDMIX are also updated accordingly.
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: fsl: Rename stream name of SAI DAI driver
commit: 0da83ab025bc45e9742e87c2cce19bff423377c8
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
On Mon, Feb 17, 2025 at 9:05 AM 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.
> 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>
Best regards
Shengjiu Wang
> ---
> - changes in v3
> Squash two fix patches in one commit
>
> sound/soc/fsl/fsl_sai.c | 6 +++---
> sound/soc/fsl/imx-audmix.c | 4 ++--
> 2 files changed, 5 insertions(+), 5 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,
> diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c
> index 50ecc5f51100..dac5d4ddacd6 100644
> --- a/sound/soc/fsl/imx-audmix.c
> +++ b/sound/soc/fsl/imx-audmix.c
> @@ -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)
> --
> 2.47.1
>
© 2016 - 2025 Red Hat, Inc.