ASoC: s6105-ipcam: Automatically disconnect non-connected pins

All CODEC input and output widgets are either in the DAPM routing table or
manually marked as non-connected. This means the card is fully routed and we can
let the core take care of disconnecting non-connected pins.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/s6000/s6105-ipcam.c b/sound/soc/s6000/s6105-ipcam.c
index 50875e66a0a3a719be1d4389a5242cb212c11e8d..3510c01f8a6a6ca587ba18b73464360645ea3ebd 100644 (file)
--- a/sound/soc/s6000/s6105-ipcam.c
+++ b/sound/soc/s6000/s6105-ipcam.c
@@ -133,22 +133,8 @@ static const struct snd_kcontrol_new audio_out_mux = {
 /* Logic for a aic3x as connected on the s6105 ip camera ref design */
 static int s6105_aic3x_init(struct snd_soc_pcm_runtime *rtd)
 {
-       struct snd_soc_codec *codec = rtd->codec;
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
        struct snd_soc_card *card = rtd->card;
 
-       /* not present */
-       snd_soc_dapm_nc_pin(dapm, "MONO_LOUT");
-       snd_soc_dapm_nc_pin(dapm, "LINE2L");
-       snd_soc_dapm_nc_pin(dapm, "LINE2R");
-
-       /* not connected */
-       snd_soc_dapm_nc_pin(dapm, "MIC3L"); /* LINE2L on this chip */
-       snd_soc_dapm_nc_pin(dapm, "MIC3R"); /* LINE2R on this chip */
-       snd_soc_dapm_nc_pin(dapm, "LLOUT");
-       snd_soc_dapm_nc_pin(dapm, "RLOUT");
-       snd_soc_dapm_nc_pin(dapm, "HPRCOM");
-
        /* must correspond to audio_out_mux.private_value initializer */
        snd_soc_dapm_disable_pin(&card->dapm, "Audio Out Differential");
 
@@ -180,6 +166,7 @@ static struct snd_soc_card snd_soc_card_s6105 = {
        .num_dapm_widgets = ARRAY_SIZE(aic3x_dapm_widgets),
        .dapm_routes = audio_map,
        .num_dapm_routes = ARRAY_SIZE(audio_map),
+       .fully_routed = true,
 };
 
 static struct s6000_snd_platform_data s6105_snd_data __initdata = {