Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25e5ef97 authored by Maciej S. Szmigiero's avatar Maciej S. Szmigiero Committed by Mark Brown
Browse files

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: default avatarMaciej S. Szmigiero <mail@maciej.szmigiero.name>
Acked-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fff6e03c

sound/soc/fsl/fsl-asoc-card.c

+9 −1
Original line number Diff line number Diff line
@@ -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;