diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-06 19:50:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-06 20:06:19 +0100 |
| commit | 87092e3ca4ff7b2c2d7723b3402fe2f74b249bc4 (patch) | |
| tree | df6e8a54dc9dd10dd5869735dd0095a41fba5ade /sound/soc/codecs/wm8994.h | |
| parent | ASoC: wm8994: Unsuspend the device while reading GPIO statuses (diff) | |
| download | linux-87092e3ca4ff7b2c2d7723b3402fe2f74b249bc4.tar.xz linux-87092e3ca4ff7b2c2d7723b3402fe2f74b249bc4.zip | |
ASoC: wm8994: Bring WM8994 accessory detection up to date
Make the mechanism used for WM8994 more like that for WM1811 and WM8958:
provide the logic to distinguish between headphone and headset and hard
code the reporting of sensible SND_JACK values. Should integration with
other detection mechanisms be required we can add appropriate callbacks
(though some integrations should be able to use the subsystem ones).
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm8994.h')
| -rw-r--r-- | sound/soc/codecs/wm8994.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h index c3a42474ab19..f996d14766d9 100644 --- a/sound/soc/codecs/wm8994.h +++ b/sound/soc/codecs/wm8994.h @@ -35,7 +35,7 @@ typedef void (*wm8958_micdet_cb)(u16 status, void *data); int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, - int micbias, int det, int shrt); + int micbias); int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, wm8958_micdet_cb cb, void *cb_data); @@ -46,8 +46,7 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec); struct wm8994_micdet { struct snd_soc_jack *jack; - int det; - int shrt; + bool detecting; }; /* codec private data */ |