diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-22 03:23:42 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-22 03:23:42 +0400 |
| commit | 8e8fbd8f5838737471e4ad55a37a8b0df02a93c0 (patch) | |
| tree | 780b5eb13992701d77b0c848b6c8f69905135d73 /sound/soc/samsung/smdk_wm8994.c | |
| parent | 6bf88ab2ecf2f3d25ee25fb4946e4487c4ffd612 (diff) | |
| parent | d77a14b579f6bfe2d149d3bcc5bd306e20d2d652 (diff) | |
| download | linux-8e8fbd8f5838737471e4ad55a37a8b0df02a93c0.tar.xz | |
Merge remote-tracking branch 'asoc/topic/dapm-init' into asoc-next
Diffstat (limited to 'sound/soc/samsung/smdk_wm8994.c')
| -rw-r--r-- | sound/soc/samsung/smdk_wm8994.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c index 682eb4f7ba0c..fc25cc00f0f2 100644 --- 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"); |