diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-22 00:23:42 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-22 00:23:42 +0100 |
| commit | 8e8fbd8f5838737471e4ad55a37a8b0df02a93c0 (patch) | |
| tree | 780b5eb13992701d77b0c848b6c8f69905135d73 /sound/soc/intel | |
| parent | 6bf88ab2ecf2f3d25ee25fb4946e4487c4ffd612 (diff) | |
| parent | d77a14b579f6bfe2d149d3bcc5bd306e20d2d652 (diff) | |
| download | blackbird-op-linux-8e8fbd8f5838737471e4ad55a37a8b0df02a93c0.tar.gz blackbird-op-linux-8e8fbd8f5838737471e4ad55a37a8b0df02a93c0.zip | |
Merge remote-tracking branch 'asoc/topic/dapm-init' into asoc-next
Diffstat (limited to 'sound/soc/intel')
| -rw-r--r-- | sound/soc/intel/byt-rt5640.c | 6 | ||||
| -rw-r--r-- | sound/soc/intel/haswell.c | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/sound/soc/intel/byt-rt5640.c b/sound/soc/intel/byt-rt5640.c index eff97c8e5218..10df4c8d78e6 100644 --- a/sound/soc/intel/byt-rt5640.c +++ b/sound/soc/intel/byt-rt5640.c @@ -100,12 +100,6 @@ static int byt_rt5640_init(struct snd_soc_pcm_runtime *runtime) snd_soc_dapm_ignore_suspend(dapm, "SPORP"); snd_soc_dapm_ignore_suspend(dapm, "SPORN"); - snd_soc_dapm_enable_pin(dapm, "Headset Mic"); - snd_soc_dapm_enable_pin(dapm, "Headphone"); - snd_soc_dapm_enable_pin(dapm, "Speaker"); - snd_soc_dapm_enable_pin(dapm, "Internal Mic"); - - snd_soc_dapm_sync(dapm); return ret; } diff --git a/sound/soc/intel/haswell.c b/sound/soc/intel/haswell.c index 54345a2a7386..94c2c33ffe49 100644 --- a/sound/soc/intel/haswell.c +++ b/sound/soc/intel/haswell.c @@ -89,8 +89,6 @@ static struct snd_soc_ops haswell_rt5640_ops = { static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd) { - struct snd_soc_codec *codec = rtd->codec; - struct snd_soc_dapm_context *dapm = &codec->dapm; struct sst_pdata *pdata = dev_get_platdata(rtd->platform->dev); struct sst_hsw *haswell = pdata->dsp; int ret; @@ -104,10 +102,6 @@ static int haswell_rtd_init(struct snd_soc_pcm_runtime *rtd) return ret; } - /* always connected */ - snd_soc_dapm_enable_pin(dapm, "Headphones"); - snd_soc_dapm_enable_pin(dapm, "Mic"); - return 0; } |
