linux-kernel - Re: [PATCH] ASoC: fsl-asoc-card: use different route map for AC'97 mode

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20151221074122.GE3524@Asurada-CZ80>
Date:	Sun, 20 Dec 2015 23:41:23 -0800
From:	Nicolin Chen <nicoleotsuka@...il.com>
To:	"Maciej S. Szmigiero" <mail@...iej.szmigiero.name>
Cc:	"alsa-devel@...a-project.org" <alsa-devel@...a-project.org>,
	Timur Tabi <timur@...i.org>, Xiubo Li <Xiubo.Lee@...il.com>,
	Liam Girdwood <lgirdwood@...il.com>,
	Mark Brown <broonie@...nel.org>,
	"linuxppc-dev@...ts.ozlabs.org" <linuxppc-dev@...ts.ozlabs.org>,
	linux-kernel <linux-kernel@...r.kernel.org>,
	Fabio Estevam <festevam@...il.com>
Subject: Re: [PATCH] ASoC: fsl-asoc-card: use different route map for AC'97
 mode

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@...iej.szmigiero.name>

Acked-by: Nicolin Chen <nicoleotsuka@...il.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;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/