Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e021180 authored by Mark Brown's avatar Mark Brown Committed by Greg Kroah-Hartman
Browse files

ASoC: fsl_ssi: Rename AC'97 streams to avoid collisions with AC'97 CODEC 



[ Upstream commit 8c6a42b5b0ed6f96624f56954e93eeae107440a6 ]

The SSI driver calls the AC'97 playback and transmit streams "AC97 Playback"
and "AC97 Capture" respectively. This is the same name used by the generic
AC'97 CODEC driver in ASoC, creating confusion for the Freescale ASoC card
when it attempts to use these widgets in routing. Add a "CPU" in the name
like the regular DAIs registered by the driver to disambiguate.

Acked-by: default avatarShengjiu Wang <shengjiu.wang@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230106-asoc-udoo-probe-v1-1-a5d7469d4f67@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 3163f4ed

sound/soc/fsl/fsl-asoc-card.c

+4 −4
Original line number Diff line number Diff line
@@ -112,11 +112,11 @@ static const struct snd_soc_dapm_route audio_map[] = { 


static const struct snd_soc_dapm_route audio_map_ac97[] = {

	/* 1st half -- Normal DAPM routes */

	{"Playback",  NULL, "AC97 Playback"},

	{"AC97 Capture",  NULL, "Capture"},

	{"Playback",  NULL, "CPU AC97 Playback"},

	{"CPU AC97 Capture",  NULL, "Capture"},

	/* 2nd half -- ASRC DAPM routes */

	{"AC97 Playback",  NULL, "ASRC-Playback"},

	{"ASRC-Capture",  NULL, "AC97 Capture"},

	{"CPU AC97 Playback",  NULL, "ASRC-Playback"},

	{"ASRC-Capture",  NULL, "CPU AC97 Capture"},

};



/* Add all possible widgets into here without being redundant */

sound/soc/fsl/fsl_ssi.c

+2 −2
Original line number Diff line number Diff line
@@ -1147,14 +1147,14 @@ static struct snd_soc_dai_driver fsl_ssi_ac97_dai = { 
	.symmetric_channels = 1,

	.probe = fsl_ssi_dai_probe,

	.playback = {

		.stream_name = "AC97 Playback",

		.stream_name = "CPU AC97 Playback",

		.channels_min = 2,

		.channels_max = 2,

		.rates = SNDRV_PCM_RATE_8000_48000,

		.formats = SNDRV_PCM_FMTBIT_S16 | SNDRV_PCM_FMTBIT_S20,

	},

	.capture = {

		.stream_name = "AC97 Capture",

		.stream_name = "CPU AC97 Capture",

		.channels_min = 2,

		.channels_max = 2,

		.rates = SNDRV_PCM_RATE_48000,