ASoC: Tegra+WM903 machine: Set the new fully_routed flag
authorStephen Warren <swarren@nvidia.com>
Wed, 23 Nov 2011 19:42:05 +0000 (12:42 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 23 Nov 2011 21:34:59 +0000 (21:34 +0000)
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>
sound/soc/tegra/tegra_wm8903.c

index 33feee8..b260f54 100644 (file)
@@ -331,27 +331,6 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
 
        snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
 
-       /* FIXME: Calculate automatically based on DAPM routes? */
-       if (!machine_is_harmony())
-               snd_soc_dapm_nc_pin(dapm, "IN1L");
-       if (!machine_is_seaboard() && !machine_is_aebl())
-               snd_soc_dapm_nc_pin(dapm, "IN1R");
-       snd_soc_dapm_nc_pin(dapm, "IN2L");
-       if (!machine_is_kaen())
-               snd_soc_dapm_nc_pin(dapm, "IN2R");
-       snd_soc_dapm_nc_pin(dapm, "IN3L");
-       snd_soc_dapm_nc_pin(dapm, "IN3R");
-
-       if (machine_is_aebl()) {
-               snd_soc_dapm_nc_pin(dapm, "LON");
-               snd_soc_dapm_nc_pin(dapm, "RON");
-               snd_soc_dapm_nc_pin(dapm, "ROP");
-               snd_soc_dapm_nc_pin(dapm, "LOP");
-       } else {
-               snd_soc_dapm_nc_pin(dapm, "LINEOUTR");
-               snd_soc_dapm_nc_pin(dapm, "LINEOUTL");
-       }
-
        return 0;
 }
 
@@ -375,6 +354,7 @@ static struct snd_soc_card snd_soc_tegra_wm8903 = {
        .num_controls = ARRAY_SIZE(tegra_wm8903_controls),
        .dapm_widgets = tegra_wm8903_dapm_widgets,
        .num_dapm_widgets = ARRAY_SIZE(tegra_wm8903_dapm_widgets),
+       .fully_routed = true,
 };
 
 static __devinit int tegra_wm8903_driver_probe(struct platform_device *pdev)