Merge remote-tracking branches 'asoc/topic/adau' and 'asoc/topic/adsp' into asoc...

[karo-tx-linux.git] / sound / soc / samsung / neo1973_wm8753.c

diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c
index b0800337b79e04dca84587f4091f8fd0989015ef..9b4a09f14b6c4b2ed859dc45eb890049efac8de7 100644 (file)
--- a/sound/soc/samsung/neo1973_wm8753.c
+++ b/sound/soc/samsung/neo1973_wm8753.c
@@ -271,15 +271,8 @@ static const struct snd_kcontrol_new neo1973_wm8753_controls[] = {
 
 static int neo1973_wm8753_init(struct snd_soc_pcm_runtime *rtd)
 {
-       struct snd_soc_codec *codec = rtd->codec;
        struct snd_soc_card *card = rtd->card;
 
-       /* set up NC codec pins */
-       snd_soc_dapm_nc_pin(&codec->dapm, "OUT3");
-       snd_soc_dapm_nc_pin(&codec->dapm, "OUT4");
-       snd_soc_dapm_nc_pin(&codec->dapm, "LINE1");
-       snd_soc_dapm_nc_pin(&codec->dapm, "LINE2");
-
        /* set endpoints to default off mode */
        snd_soc_dapm_disable_pin(&card->dapm, "GSM Line Out");
        snd_soc_dapm_disable_pin(&card->dapm, "GSM Line In");
@@ -355,6 +348,7 @@ static struct snd_soc_card neo1973 = {
        .num_dapm_widgets = ARRAY_SIZE(neo1973_wm8753_dapm_widgets),
        .dapm_routes = neo1973_wm8753_routes,
        .num_dapm_routes = ARRAY_SIZE(neo1973_wm8753_routes),
+       .fully_routed = true,
 };
 
 static struct platform_device *neo1973_snd_device;