lkml.org 
[lkml]   [2023]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.4 07/16] ASoC: fsl_ssi: Rename AC'97 streams to avoid collisions with AC'97 CODEC
    Date
    From: Mark Brown <broonie@kernel.org>

    [ 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: 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-1-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 | 8 ++++----
    sound/soc/fsl/fsl_ssi.c | 4 ++--
    2 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
    index 39ea9bda1394..d78eb9f9d24c 100644
    --- a/sound/soc/fsl/fsl-asoc-card.c
    +++ b/sound/soc/fsl/fsl-asoc-card.c
    @@ -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 */
    diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
    index ed18bc69e095..0ab35c3dc7d2 100644
    --- a/sound/soc/fsl/fsl_ssi.c
    +++ b/sound/soc/fsl/fsl_ssi.c
    @@ -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,
    --
    2.35.1
    \
     
     \ /
      Last update: 2023-03-26 23:43    [W:6.834 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site