]> git.baikalelectronics.ru Git - kernel.git/commitdiff
ASoC: fsl-asoc-card: Fix naming of AC'97 CODEC widgets
authorMark Brown <broonie@kernel.org>
Fri, 6 Jan 2023 23:15:07 +0000 (23:15 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2023 06:52:41 +0000 (07:52 +0100)
[ Upstream commit 242fc66ae6e1e2b8519daacc7590a73cd0e8a6e4 ]

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: Shengjiu Wang <shengjiu.wang@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230106-asoc-udoo-probe-v1-2-a5d7469d4f67@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
sound/soc/fsl/fsl-asoc-card.c

index d78eb9f9d24cfc0791d01e26a75f802c06f5e661..db663e7d17a42a72b410048fa36ef9156bdf8de3 100644 (file)
@@ -112,8 +112,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"},