Skip to content

Commit

Permalink
ALSA: ASoC: Convert playpaq_wm8510 to bulk route registration API
Browse files Browse the repository at this point in the history
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Mark Brown authored and Takashi Iwai committed Oct 16, 2008
1 parent d5d8d83 commit cdbdd16
Showing 1 changed file with 3 additions and 9 deletions.
12 changes: 3 additions & 9 deletions sound/soc/at32/playpaq_wm8510.c
Original file line number Diff line number Diff line change
Expand Up @@ -304,17 +304,14 @@ static const struct snd_soc_dapm_widget playpaq_dapm_widgets[] = {



static const char *intercon[][3] = {
static const struct snd_soc_dapm_route intercon[] = {
/* speaker connected to SPKOUT */
{"Ext Spk", NULL, "SPKOUTP"},
{"Ext Spk", NULL, "SPKOUTN"},

{"Mic Bias", NULL, "Int Mic"},
{"MICN", NULL, "Mic Bias"},
{"MICP", NULL, "Mic Bias"},

/* Terminator */
{NULL, NULL, NULL},
};


Expand All @@ -334,11 +331,8 @@ static int playpaq_wm8510_init(struct snd_soc_codec *codec)
/*
* Setup audio path interconnects
*/
for (i = 0; intercon[i][0] != NULL; i++) {
snd_soc_dapm_connect_input(codec,
intercon[i][0],
intercon[i][1], intercon[i][2]);
}
snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));



/* always connected pins */
Expand Down

0 comments on commit cdbdd16

Please sign in to comment.