ASoC: palm27x: Automatically disconnect non-connected pins
authorLars-Peter Clausen <lars@metafoo.de>
Fri, 9 Jan 2015 21:03:32 +0000 (22:03 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 9 Jan 2015 21:05:55 +0000 (21:05 +0000)
All DAPM input and output pins of the wm9712 are either used in the card's
DAPM routing table or are marked as not connected.

Set the fully_routed flag of the card instead of manually marking the unused
inputs and outputs as not connected. This makes the code a bit shorter and
cleaner.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/pxa/palm27x.c

index 5a0b82f93b1509c81f42cf515b1bb201af71286a..910336c5ebebd1486048552af7f598b6d7747b0d 100644 (file)
@@ -76,18 +76,8 @@ static struct snd_soc_card palm27x_asoc;
 static int palm27x_ac97_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_codec *codec = rtd->codec;
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
        int err;
 
-       /* not connected pins */
-       snd_soc_dapm_nc_pin(dapm, "OUT3");
-       snd_soc_dapm_nc_pin(dapm, "MONOOUT");
-       snd_soc_dapm_nc_pin(dapm, "LINEINL");
-       snd_soc_dapm_nc_pin(dapm, "LINEINR");
-       snd_soc_dapm_nc_pin(dapm, "PCBEEP");
-       snd_soc_dapm_nc_pin(dapm, "PHONE");
-       snd_soc_dapm_nc_pin(dapm, "MIC2");
-
        /* Jack detection API stuff */
        err = snd_soc_jack_new(codec, "Headphone Jack",
                                SND_JACK_HEADPHONE, &hs_jack);
@@ -133,7 +123,8 @@ static struct snd_soc_card palm27x_asoc = {
        .dapm_widgets = palm27x_dapm_widgets,
        .num_dapm_widgets = ARRAY_SIZE(palm27x_dapm_widgets),
        .dapm_routes = audio_map,
-       .num_dapm_routes = ARRAY_SIZE(audio_map)
+       .num_dapm_routes = ARRAY_SIZE(audio_map),
+       .fully_routed = true,
 };
 
 static int palm27x_asoc_probe(struct platform_device *pdev)