diff options
| author | Tapani <tapani@vmail.me> | 2012-12-31 17:49:00 +0100 |
|---|---|---|
| committer | John Weber <rjohnweber@gmail.com> | 2013-07-28 23:37:35 -0500 |
| commit | 5b6342ebde5ebf2647645fd10dfdecbac661d8b9 (patch) | |
| tree | 5dd786fb00f431cd552fa23336c79f3315b347fa | |
| parent | 99322e8377fbcb7435ecfab6e42b6c949fa4e88d (diff) | |
| download | linux-5b6342ebde5ebf2647645fd10dfdecbac661d8b9.tar.gz | |
Enable headphone jack by default on sgtl5000.
This patch reverts a change introduced by commit eec23c400e5c39ae338b9112031a302230220294
Conflicts:
sound/soc/imx/imx-sgtl5000.c
(cherry picked from commit 39405bfab671b5dbfc3ff7b41b77a0fc954b7824)
| -rw-r--r-- | sound/soc/imx/imx-sgtl5000.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/imx/imx-sgtl5000.c b/sound/soc/imx/imx-sgtl5000.c index 9325dc8e346c..f019f2f7afb9 100644 --- a/sound/soc/imx/imx-sgtl5000.c +++ b/sound/soc/imx/imx-sgtl5000.c @@ -247,6 +247,7 @@ static int imx_3stack_sgtl5000_init(struct snd_soc_pcm_runtime *rtd) snd_soc_dapm_disable_pin(&codec->dapm, "Line In Jack"); snd_soc_dapm_enable_pin(&codec->dapm, "Headphone Jack"); + snd_soc_dapm_disable_pin(&codec->dapm, "Ext Spk"); snd_soc_dapm_sync(&codec->dapm); if (hs_jack_gpios[0].gpio != -1) { |