diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-03 02:14:37 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-03 02:35:00 -0500 |
commit | 98869f68f2f68a9f238f5e96dbc3f838a0ff7136 (patch) | |
tree | 9a0106eb3566f381ec63073e1a4115cbe61069c0 /sound/soc/codecs/wm8994.h | |
parent | e874de436f6c7ddbcca1e1fb7edd4d05ad274048 (diff) |
ASoC: wm8994: Allow microphone identification callback to be overridden
Allow custom accessory identification mechanisms to make use of the MICDET
support in the device.
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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h index 1a6bb4ed08f8..46a7bdb7d255 100644 --- a/sound/soc/codecs/wm8994.h +++ b/sound/soc/codecs/wm8994.h | |||
@@ -40,11 +40,13 @@ enum wm8994_vmid_mode { | |||
40 | }; | 40 | }; |
41 | 41 | ||
42 | typedef void (*wm1811_micdet_cb)(void *data); | 42 | typedef void (*wm1811_micdet_cb)(void *data); |
43 | typedef void (*wm1811_mic_id_cb)(void *data, u16 status); | ||
43 | 44 | ||
44 | int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, | 45 | int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, |
45 | int micbias); | 46 | int micbias); |
46 | int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, | 47 | int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, |
47 | wm1811_micdet_cb cb, void *cb_data); | 48 | wm1811_micdet_cb cb, void *det_cb_data, |
49 | wm1811_mic_id_cb id_cb, void *id_cb_data); | ||
48 | 50 | ||
49 | int wm8994_vmid_mode(struct snd_soc_codec *codec, enum wm8994_vmid_mode mode); | 51 | int wm8994_vmid_mode(struct snd_soc_codec *codec, enum wm8994_vmid_mode mode); |
50 | 52 | ||
@@ -140,6 +142,8 @@ struct wm8994_priv { | |||
140 | int micdet_irq; | 142 | int micdet_irq; |
141 | wm1811_micdet_cb micd_cb; | 143 | wm1811_micdet_cb micd_cb; |
142 | void *micd_cb_data; | 144 | void *micd_cb_data; |
145 | wm1811_mic_id_cb mic_id_cb; | ||
146 | void *mic_id_cb_data; | ||
143 | 147 | ||
144 | int revision; | 148 | int revision; |
145 | 149 | ||