hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: palm27x: fix widgets and routes in dai_link init 

ASoC core code now handles creation of controls and routing based on contents of
struct snd_soc_card, so remove calls to snd_soc_dapm_new_controls() and
snd_soc_dapm_add_routes() from the snd_soc_dai_link init function, and add
widget and route definitions to struct snd_soc_card.

Signed-off-by: Mike Dunn <mikedunn@newsguy.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mike Dunn 2012-12-29 10:53:17 -08:00 committed by Mark Brown
parent a49f0d1ea3
commit 016fb39c98
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/pxa/palm27x.c
View File

@ -79,17 +79,6 @@ static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_dapm_context *dapm = &codec->dapm; struct snd_soc_dapm_context *dapm = &codec->dapm;
int err; int err;
/* add palm27x specific widgets */
err = snd_soc_dapm_new_controls(dapm, palm27x_dapm_widgets,
ARRAY_SIZE(palm27x_dapm_widgets));
if (err)
return err;
/* set up palm27x specific audio path audio_map */
err = snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
if (err)
return err;
/* connected pins */ /* connected pins */
if (machine_is_palmld()) if (machine_is_palmld())
snd_soc_dapm_enable_pin(dapm, "MIC1"); snd_soc_dapm_enable_pin(dapm, "MIC1");
@ -149,6 +138,10 @@ static struct snd_soc_card palm27x_asoc = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.dai_link = palm27x_dai, .dai_link = palm27x_dai,
.num_links = ARRAY_SIZE(palm27x_dai), .num_links = ARRAY_SIZE(palm27x_dai),
.dapm_widgets = palm27x_dapm_widgets,
.num_dapm_widgets = ARRAY_SIZE(palm27x_dapm_widgets),
.dapm_routes = audio_map,
.num_dapm_routes = ARRAY_SIZE(audio_map)
}; };
static struct platform_device *palm27x_snd_device; static struct platform_device *palm27x_snd_device;