summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/sn95031.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2011-02-10 12:58:01 +0530
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-02-11 11:16:29 +0000
commit7ae7434086f5b106021276e88b8ef49debf30aa8 (patch)
tree3a8775b2e5bb80923125159d2495c8371f2193fd /sound/soc/codecs/sn95031.c
parent4a5aa6e9ea670cf8de39ae0b87010fce41a6dd73 (diff)
ASoC: mid-x86: Use the soc-jack apis for jack type detection
This patch modifies the mfld_machine to use the new jack apis for adding the voltage zones for jack type detection. It also modifed TI sn95031 codec driver to use these new apis Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Harsha Priya <priya.harsha@intel.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/sn95031.c')
-rw-r--r--sound/soc/codecs/sn95031.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
index 4cc00177ee3d..d0b780206716 100644
--- a/sound/soc/codecs/sn95031.c
+++ b/sound/soc/codecs/sn95031.c
@@ -782,9 +782,7 @@ static int sn95031_get_headset_state(struct snd_soc_jack *mfld_jack)
{
int micbias = sn95031_get_mic_bias(mfld_jack->codec);
- /* Defaulting to HEADSET for now.
- * will change after adding soc-jack detection apis */
- int jack_type = SND_JACK_HEADSET;
+ int jack_type = snd_soc_jack_get_type(mfld_jack, micbias);
pr_debug("jack type detected = %d\n", jack_type);
if (jack_type == SND_JACK_HEADSET)