From: Nicolin Chen <nicoleotsuka@gmail.com>
To: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
Cc: "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
Timur Tabi <timur@tabi.org>, Xiubo Li <Xiubo.Lee@gmail.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Fabio Estevam <festevam@gmail.com>
Subject: Re: [PATCH] ASoC: fsl-asoc-card: use different route map for AC'97 mode
Date: Sun, 20 Dec 2015 23:41:23 -0800 [thread overview]
Message-ID: <20151221074122.GE3524@Asurada-CZ80> (raw)
In-Reply-To: <567710D5.5040405@maciej.szmigiero.name>
On Sun, Dec 20, 2015 at 09:34:29PM +0100, Maciej S. Szmigiero wrote:
> fsl_ssi uses different stream names ("AC97 Playback" / "AC97 Capture")
> in AC'97 mode so in this case fsl-asoc-card route map should
> also be using them.
>
> Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
> ---
> sound/soc/fsl/fsl-asoc-card.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
> index c63d89da51f1..562b3bd22d9a 100644
> --- a/sound/soc/fsl/fsl-asoc-card.c
> +++ b/sound/soc/fsl/fsl-asoc-card.c
> @@ -107,6 +107,13 @@ static const struct snd_soc_dapm_route audio_map[] = {
> {"CPU-Capture", NULL, "Capture"},
> };
>
> +static const struct snd_soc_dapm_route audio_map_ac97[] = {
> + {"AC97 Playback", NULL, "ASRC-Playback"},
> + {"Playback", NULL, "AC97 Playback"},
> + {"ASRC-Capture", NULL, "AC97 Capture"},
> + {"AC97 Capture", NULL, "Capture"},
> +};
> +
> /* Add all possible widgets into here without being redundant */
> static const struct snd_soc_dapm_widget fsl_asoc_card_dapm_widgets[] = {
> SND_SOC_DAPM_LINE("Line Out Jack", NULL),
> @@ -579,7 +586,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
> priv->card.dev = &pdev->dev;
> priv->card.name = priv->name;
> priv->card.dai_link = priv->dai_link;
> - priv->card.dapm_routes = audio_map;
> + priv->card.dapm_routes = fsl_asoc_card_is_ac97(priv) ?
> + audio_map_ac97 : audio_map;
> priv->card.late_probe = fsl_asoc_card_late_probe;
> priv->card.num_dapm_routes = ARRAY_SIZE(audio_map);
> priv->card.dapm_widgets = fsl_asoc_card_dapm_widgets;
>
WARNING: multiple messages have this Message-ID (diff)
From: Nicolin Chen <nicoleotsuka@gmail.com>
To: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
Cc: "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
Xiubo Li <Xiubo.Lee@gmail.com>,
linux-kernel <linux-kernel@vger.kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>, Timur Tabi <timur@tabi.org>,
Mark Brown <broonie@kernel.org>,
Fabio Estevam <festevam@gmail.com>,
"linuxppc-dev@lists.ozlabs.org" <linuxppc-dev@lists.ozlabs.org>
Subject: Re: [PATCH] ASoC: fsl-asoc-card: use different route map for AC'97 mode
Date: Sun, 20 Dec 2015 23:41:23 -0800 [thread overview]
Message-ID: <20151221074122.GE3524@Asurada-CZ80> (raw)
In-Reply-To: <567710D5.5040405@maciej.szmigiero.name>
On Sun, Dec 20, 2015 at 09:34:29PM +0100, Maciej S. Szmigiero wrote:
> fsl_ssi uses different stream names ("AC97 Playback" / "AC97 Capture")
> in AC'97 mode so in this case fsl-asoc-card route map should
> also be using them.
>
> Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
> ---
> sound/soc/fsl/fsl-asoc-card.c | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
> index c63d89da51f1..562b3bd22d9a 100644
> --- a/sound/soc/fsl/fsl-asoc-card.c
> +++ b/sound/soc/fsl/fsl-asoc-card.c
> @@ -107,6 +107,13 @@ static const struct snd_soc_dapm_route audio_map[] = {
> {"CPU-Capture", NULL, "Capture"},
> };
>
> +static const struct snd_soc_dapm_route audio_map_ac97[] = {
> + {"AC97 Playback", NULL, "ASRC-Playback"},
> + {"Playback", NULL, "AC97 Playback"},
> + {"ASRC-Capture", NULL, "AC97 Capture"},
> + {"AC97 Capture", NULL, "Capture"},
> +};
> +
> /* Add all possible widgets into here without being redundant */
> static const struct snd_soc_dapm_widget fsl_asoc_card_dapm_widgets[] = {
> SND_SOC_DAPM_LINE("Line Out Jack", NULL),
> @@ -579,7 +586,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
> priv->card.dev = &pdev->dev;
> priv->card.name = priv->name;
> priv->card.dai_link = priv->dai_link;
> - priv->card.dapm_routes = audio_map;
> + priv->card.dapm_routes = fsl_asoc_card_is_ac97(priv) ?
> + audio_map_ac97 : audio_map;
> priv->card.late_probe = fsl_asoc_card_late_probe;
> priv->card.num_dapm_routes = ARRAY_SIZE(audio_map);
> priv->card.dapm_widgets = fsl_asoc_card_dapm_widgets;
>
next prev parent reply other threads:[~2015-12-21 7:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-20 20:34 [PATCH] ASoC: fsl-asoc-card: use different route map for AC'97 mode Maciej S. Szmigiero
2015-12-21 7:41 ` Nicolin Chen [this message]
2015-12-21 7:41 ` Nicolin Chen
2015-12-23 0:08 ` Applied "ASoC: fsl-asoc-card: use different route map for AC'97 mode" to the asoc tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151221074122.GE3524@Asurada-CZ80 \
--to=nicoleotsuka@gmail.com \
--cc=Xiubo.Lee@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mail@maciej.szmigiero.name \
--cc=timur@tabi.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.