Commit 35d67673 authored by Mark Brown's avatar Mark Brown Committed by sanglipeng
Browse files

ASoC: fsl-asoc-card: Fix naming of AC'97 CODEC widgets 

stable inclusion
from stable-v5.10.166
commit a84def9b108a44bba2d6afc800302f977738f94f
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7TH9O

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a84def9b108a44bba2d6afc800302f977738f94f



--------------------------------

[ Upstream commit 242fc66a ]

The fsl-asoc-card AC'97 support currently tries to route to Playback and
Capture widgets provided by the AC'97 CODEC. This doesn't work since the
generic AC'97 driver registers with an "AC97" at the front of the stream
and hence widget names, update to reflect reality. It's not clear to me
if or how this ever worked.

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-2-a5d7469d4f67@kernel.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 1bb94c3a

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

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ 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, "CPU AC97 Playback"},

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

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

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

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

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

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