aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/tegra/tegra_wm8903.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-11-23 14:42:05 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-11-23 16:34:59 -0500
commit6e5fdba9c9d4e2fdb19bf19633cb7b9bb72dccb1 (patch)
tree17a7af8a99cb05d444eedd0c9ca92f48a1bdbe17 /sound/soc/tegra/tegra_wm8903.c
parent1633281b79fd276f1c7c2fb37c3b97da74e42ae5 (diff)
ASoC: Tegra+WM903 machine: Set the new fully_routed flag
Set card.fully_routed to request the ASoC core calculated unused codec pins, and call snd_soc_dapm_nc_pin() for them. Remove the open-coded calls. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra/tegra_wm8903.c')
-rw-r--r--sound/soc/tegra/tegra_wm8903.c22
1 files changed, 1 insertions, 21 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c
index 33feee81668c..b260f54a4462 100644
--- a/sound/soc/tegra/tegra_wm8903.c
+++ b/sound/soc/tegra/tegra_wm8903.c
@@ -331,27 +331,6 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
331 331
332 snd_soc_dapm_force_enable_pin(dapm, "Mic Bias"); 332 snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
333 333
334 /* FIXME: Calculate automatically based on DAPM routes? */
335 if (!machine_is_harmony())
336 snd_soc_dapm_nc_pin(dapm, "IN1L");
337 if (!machine_is_seaboard() && !machine_is_aebl())
338 snd_soc_dapm_nc_pin(dapm, "IN1R");
339 snd_soc_dapm_nc_pin(dapm, "IN2L");
340 if (!machine_is_kaen())
341 snd_soc_dapm_nc_pin(dapm, "IN2R");
342 snd_soc_dapm_nc_pin(dapm, "IN3L");
343 snd_soc_dapm_nc_pin(dapm, "IN3R");
344
345 if (machine_is_aebl()) {
346 snd_soc_dapm_nc_pin(dapm, "LON");
347 snd_soc_dapm_nc_pin(dapm, "RON");
348 snd_soc_dapm_nc_pin(dapm, "ROP");
349 snd_soc_dapm_nc_pin(dapm, "LOP");
350 } else {
351 snd_soc_dapm_nc_pin(dapm, "LINEOUTR");
352 snd_soc_dapm_nc_pin(dapm, "LINEOUTL");
353 }
354
355 return 0; 334 return 0;
356} 335}
357 336
@@ -375,6 +354,7 @@ static struct snd_soc_card snd_soc_tegra_wm8903 = {
375 .num_controls = ARRAY_SIZE(tegra_wm8903_controls), 354 .num_controls = ARRAY_SIZE(tegra_wm8903_controls),
376 .dapm_widgets = tegra_wm8903_dapm_widgets, 355 .dapm_widgets = tegra_wm8903_dapm_widgets,
377 .num_dapm_widgets = ARRAY_SIZE(tegra_wm8903_dapm_widgets), 356 .num_dapm_widgets = ARRAY_SIZE(tegra_wm8903_dapm_widgets),
357 .fully_routed = true,
378}; 358};
379 359
380static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev) 360static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)