aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-10-16 06:00:06 -0400
committerTakashi Iwai <tiwai@suse.de>2008-10-16 06:50:20 -0400
commitcdbdd1676a5379f1d5cbd4d476f5e349f445befe (patch)
tree42e6bc3eb15e2c4e84544b261863223aa702a698 /sound/soc
parentd5d8d83773165b951d190717637bfbc1eb0111a0 (diff)
ALSA: ASoC: Convert playpaq_wm8510 to bulk route registration API
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/at32/playpaq_wm8510.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/sound/soc/at32/playpaq_wm8510.c b/sound/soc/at32/playpaq_wm8510.c
index 98a2d5826a8..b1966e4dfcd 100644
--- a/sound/soc/at32/playpaq_wm8510.c
+++ b/sound/soc/at32/playpaq_wm8510.c
@@ -304,7 +304,7 @@ static const struct snd_soc_dapm_widget playpaq_dapm_widgets[] = {
304 304
305 305
306 306
307static const char *intercon[][3] = { 307static const struct snd_soc_dapm_route intercon[] = {
308 /* speaker connected to SPKOUT */ 308 /* speaker connected to SPKOUT */
309 {"Ext Spk", NULL, "SPKOUTP"}, 309 {"Ext Spk", NULL, "SPKOUTP"},
310 {"Ext Spk", NULL, "SPKOUTN"}, 310 {"Ext Spk", NULL, "SPKOUTN"},
@@ -312,9 +312,6 @@ static const char *intercon[][3] = {
312 {"Mic Bias", NULL, "Int Mic"}, 312 {"Mic Bias", NULL, "Int Mic"},
313 {"MICN", NULL, "Mic Bias"}, 313 {"MICN", NULL, "Mic Bias"},
314 {"MICP", NULL, "Mic Bias"}, 314 {"MICP", NULL, "Mic Bias"},
315
316 /* Terminator */
317 {NULL, NULL, NULL},
318}; 315};
319 316
320 317
@@ -334,11 +331,8 @@ static int playpaq_wm8510_init(struct snd_soc_codec *codec)
334 /* 331 /*
335 * Setup audio path interconnects 332 * Setup audio path interconnects
336 */ 333 */
337 for (i = 0; intercon[i][0] != NULL; i++) { 334 snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
338 snd_soc_dapm_connect_input(codec, 335
339 intercon[i][0],
340 intercon[i][1], intercon[i][2]);
341 }
342 336
343 337
344 /* always connected pins */ 338 /* always connected pins */