Merge remote-tracking branches 'asoc/topic/samsung', 'asoc/topic/sgtl5000', 'asoc...

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

diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index 5b544dcf18b4696bd2b0fd2f7a8b375ddc42244a..3d6272a8cad25949321bb96b87f8abe9be07d96c 100644 (file)
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -89,18 +89,6 @@ static int smdk_wm8994_init_paiftx(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_codec *codec = rtd->codec;
        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-       /* HeadPhone */
-       snd_soc_dapm_enable_pin(dapm, "HPOUT1R");
-       snd_soc_dapm_enable_pin(dapm, "HPOUT1L");
-
-       /* MicIn */
-       snd_soc_dapm_enable_pin(dapm, "IN1LN");
-       snd_soc_dapm_enable_pin(dapm, "IN1RN");
-
-       /* LineIn */
-       snd_soc_dapm_enable_pin(dapm, "IN2LN");
-       snd_soc_dapm_enable_pin(dapm, "IN2RN");
-
        /* Other pins NC */
        snd_soc_dapm_nc_pin(dapm, "HPOUT2P");
        snd_soc_dapm_nc_pin(dapm, "HPOUT2N");