summaryrefslogtreecommitdiff
path: root/sound/soc/pxa/ttc-dkb.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-05-21 23:23:42 (GMT)
committerMark Brown <broonie@linaro.org>2014-05-21 23:23:42 (GMT)
commit8e8fbd8f5838737471e4ad55a37a8b0df02a93c0 (patch)
tree780b5eb13992701d77b0c848b6c8f69905135d73 /sound/soc/pxa/ttc-dkb.c
parent6bf88ab2ecf2f3d25ee25fb4946e4487c4ffd612 (diff)
parentd77a14b579f6bfe2d149d3bcc5bd306e20d2d652 (diff)
downloadlinux-8e8fbd8f5838737471e4ad55a37a8b0df02a93c0.tar.xz
Merge remote-tracking branch 'asoc/topic/dapm-init' into asoc-next
Diffstat (limited to 'sound/soc/pxa/ttc-dkb.c')
-rw-r--r--sound/soc/pxa/ttc-dkb.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c
index 0b535b5..9d7c5b7 100644
--- a/sound/soc/pxa/ttc-dkb.c
+++ b/sound/soc/pxa/ttc-dkb.c
@@ -78,10 +78,6 @@ static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_codec *codec = rtd->codec;
struct snd_soc_dapm_context *dapm = &codec->dapm;
- /* connected pins */
- snd_soc_dapm_enable_pin(dapm, "Ext Speaker");
- snd_soc_dapm_enable_pin(dapm, "Ext Mic 1");
- snd_soc_dapm_enable_pin(dapm, "Ext Mic 3");
snd_soc_dapm_disable_pin(dapm, "Headset Mic 2");
snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");