summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-04 07:54:55 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-19 18:30:59 +0100
commit45cf367e8058ff3f1f6f9c3e9f617bfd7cff65b1 (patch)
treeb51bbe7dff08b7b74a6529a16340734053cbb13f /sound/soc
parent0b684cc14a791accdd6d97cb68242ab5009ece3e (diff)
downloadlinux-45cf367e8058ff3f1f6f9c3e9f617bfd7cff65b1.tar.bz2
ASoC: Add line loads to the list of supported detections for Speyside
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/samsung/speyside.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c
index 09df8afbb447..b9e213f6cc06 100644
--- a/sound/soc/samsung/speyside.c
+++ b/sound/soc/samsung/speyside.c
@@ -167,7 +167,8 @@ static int speyside_wm8996_init(struct snd_soc_pcm_runtime *rtd)
gpio_direction_output(WM8996_HPSEL_GPIO, speyside_jack_polarity);
ret = snd_soc_jack_new(codec, "Headset",
- SND_JACK_HEADSET | SND_JACK_BTN_0,
+ SND_JACK_LINEOUT | SND_JACK_HEADSET |
+ SND_JACK_BTN_0,
&speyside_headset);
if (ret)
return ret;