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

Commit 23d8f225 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: pxa: e740_wm9705: Convert to table based DAPM setup 



Use table based setup to register the DAPM widgets and routes. This on one hand
makes the code a bit cleaner and on the other hand the board level DAPM elements
get registered in the card's DAPM context rather than in the CODEC's DAPM
context.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent e14de47a

sound/soc/pxa/e740_wm9705.c

+5 −5
Original line number Diff line number Diff line
@@ -103,11 +103,6 @@ static int e740_ac97_init(struct snd_soc_pcm_runtime *rtd) 
	snd_soc_dapm_nc_pin(dapm, "PCBEEP");

	snd_soc_dapm_nc_pin(dapm, "MIC2");



	snd_soc_dapm_new_controls(dapm, e740_dapm_widgets,

					ARRAY_SIZE(e740_dapm_widgets));



	snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));



	return 0;

}
@@ -136,6 +131,11 @@ static struct snd_soc_card e740 = { 
	.owner = THIS_MODULE,

	.dai_link = e740_dai,

	.num_links = ARRAY_SIZE(e740_dai),



	.dapm_widgets = e740_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(e740_dapm_widgets),

	.dapm_routes = audio_map,

	.num_dapm_routes = ARRAY_SIZE(audio_map),

};



static struct gpio e740_audio_gpios[] = {