diff options
| author | Lionel.Xu <r63889@freescale.com> | 2009-04-28 13:13:24 +0800 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2009-10-13 11:05:22 -0400 |
| commit | d292a5fc62b1371b19e9962ac6839541f4957419 (patch) | |
| tree | 8ae7de8e4b13b9fece512a9d4270472edf4ab0e9 | |
| parent | 4f83945eb295dfbff0cb357e52a4515b2f25c502 (diff) | |
ENGR00115113 SGTL5000: Jack Function/Speaker Function
With the pop fix and power savings patches, it is possible to bring back the
Jack Function/Speaker Function.
Enable alsa amixer controls Jack Function and Speaker Function. By setting or
unsetting these controls it is now able to turn on or off headphone and speaker
output.
Signed-off-by: Lionel Xu <r63889@freescale.com>
| -rw-r--r-- | sound/soc/imx/imx-3stack-sgtl5000.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/soc/imx/imx-3stack-sgtl5000.c b/sound/soc/imx/imx-3stack-sgtl5000.c index bba68da621c9..0ab4c2c2231c 100644 --- a/sound/soc/imx/imx-3stack-sgtl5000.c +++ b/sound/soc/imx/imx-3stack-sgtl5000.c @@ -296,9 +296,6 @@ static const struct snd_soc_dapm_route audio_map[] = { /* HP_OUT --> Headphone Jack */ {"Headphone Jack", NULL, "HP_OUT"}, - /* LINE_OUT --> Line Out Jack */ - {"Line Out Jack", NULL, "LINE_OUT"}, - /* LINE_OUT --> Ext Speaker */ {"Ext Spk", NULL, "LINE_OUT"}, }; @@ -403,9 +400,9 @@ static int sgtl5000_set_spk(struct snd_kcontrol *kcontrol, sgtl5000_spk_func = ucontrol->value.enumerated.item[0]; if (sgtl5000_spk_func) - snd_soc_dapm_enable_pin(codec, "Line Out Jack"); + snd_soc_dapm_enable_pin(codec, "Ext Spk"); else - snd_soc_dapm_disable_pin(codec, "Line Out Jack"); + snd_soc_dapm_disable_pin(codec, "Ext Spk"); snd_soc_dapm_sync(codec); return 1; @@ -433,7 +430,6 @@ static int spk_amp_event(struct snd_soc_dapm_widget *w, static const struct snd_soc_dapm_widget imx_3stack_dapm_widgets[] = { SND_SOC_DAPM_MIC("Mic Jack", NULL), SND_SOC_DAPM_LINE("Line In Jack", NULL), - SND_SOC_DAPM_LINE("Line Out Jack", NULL), SND_SOC_DAPM_SPK("Ext Spk", spk_amp_event), SND_SOC_DAPM_HP("Headphone Jack", NULL), }; |