* [PATCH] ASoC: fsl-asoc-card: use different route map for AC'97 mode
@ 2015-12-20 20:34 Maciej S. Szmigiero
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
0 siblings, 2 replies; 4+ messages in thread
From: Maciej S. Szmigiero @ 2015-12-20 20:34 UTC (permalink / raw)
To: alsa-devel
Cc: Timur Tabi, Nicolin Chen, Xiubo Li, Liam Girdwood, Mark Brown,
linuxppc-dev, linux-kernel, Fabio Estevam
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>
---
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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: fsl-asoc-card: use different route map for AC'97 mode
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
2015-12-23 0:08 ` Applied "ASoC: fsl-asoc-card: use different route map for AC'97 mode" to the asoc tree Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Nicolin Chen @ 2015-12-21 7:41 UTC (permalink / raw)
To: Maciej S. Szmigiero
Cc: alsa-devel, Timur Tabi, Xiubo Li, Liam Girdwood, Mark Brown,
linuxppc-dev, linux-kernel, Fabio Estevam
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;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: fsl-asoc-card: use different route map for AC'97 mode
@ 2015-12-21 7:41 ` Nicolin Chen
0 siblings, 0 replies; 4+ messages in thread
From: Nicolin Chen @ 2015-12-21 7:41 UTC (permalink / raw)
To: Maciej S. Szmigiero
Cc: alsa-devel, Xiubo Li, linux-kernel, Liam Girdwood, Timur Tabi,
Mark Brown, Fabio Estevam, linuxppc-dev
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;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Applied "ASoC: fsl-asoc-card: use different route map for AC'97 mode" to the asoc tree
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
@ 2015-12-23 0:08 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2015-12-23 0:08 UTC (permalink / raw)
To: Maciej S. Szmigiero, Nicolin Chen, Mark Brown; +Cc: alsa-devel
The patch
ASoC: fsl-asoc-card: use different route map for AC'97 mode
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 25e5ef974c33f1e4a07a68bf830e6493ee6dab11 Mon Sep 17 00:00:00 2001
From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
Date: Sun, 20 Dec 2015 21:34:29 +0100
Subject: [PATCH] ASoC: fsl-asoc-card: use different route map for AC'97 mode
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
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 1b05d1c5d9fd..6fb3aed91b44 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),
@@ -574,7 +581,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;
--
2.6.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-23 0:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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
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
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.