Unverified Commit 0da83ab0 authored by Chancel Liu's avatar Chancel Liu Committed by Mark Brown
Browse files

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: 15c95839 ("ASoC: fsl_sai: Add separate DAI for transmitter and receiver")
Signed-off-by: default avatarChancel Liu <chancel.liu@nxp.com>
Acked-by: default avatarShengjiu Wang <shengjiu.wang@gmail.com>
Link: https://patch.msgid.link/20250217010437.258621-1-chancel.liu@nxp.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5b0c02f9

sound/soc/fsl/fsl_sai.c

+3 −3
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ 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,
@@ -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,

sound/soc/fsl/imx-audmix.c

+2 −2
Original line number Diff line number Diff line
@@ -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)