diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-22 06:44:32 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-03 02:34:12 -0500 |
commit | 63dd54521f1d143fbc6584ace66ef264a7f867f7 (patch) | |
tree | c7cc350894650771f79b95f6729b275b34d17de1 /sound/soc/codecs/wm8994.h | |
parent | 78b76dbec8da6437e30519e6bbe4fb44d798addf (diff) |
ASoC: wm8994: Support custom accessory identification for WM1811A
Allow the user to override the accessory identification code with their
own implementation if the system provides an alternative method.
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, 4 insertions, 2 deletions
diff --git a/sound/soc/codecs/wm8994.h b/sound/soc/codecs/wm8994.h index f5546f242ab1..1a6bb4ed08f8 100644 --- a/sound/soc/codecs/wm8994.h +++ b/sound/soc/codecs/wm8994.h | |||
@@ -39,12 +39,12 @@ enum wm8994_vmid_mode { | |||
39 | WM8994_VMID_FORCE, | 39 | WM8994_VMID_FORCE, |
40 | }; | 40 | }; |
41 | 41 | ||
42 | typedef void (*wm8958_micdet_cb)(u16 status, void *data); | 42 | typedef void (*wm1811_micdet_cb)(void *data); |
43 | 43 | ||
44 | int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, | 44 | int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, |
45 | int micbias); | 45 | int micbias); |
46 | int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, | 46 | int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, |
47 | wm8958_micdet_cb cb, void *cb_data); | 47 | wm1811_micdet_cb cb, void *cb_data); |
48 | 48 | ||
49 | int wm8994_vmid_mode(struct snd_soc_codec *codec, enum wm8994_vmid_mode mode); | 49 | int wm8994_vmid_mode(struct snd_soc_codec *codec, enum wm8994_vmid_mode mode); |
50 | 50 | ||
@@ -138,6 +138,8 @@ struct wm8994_priv { | |||
138 | struct delayed_work jackdet_bootstrap; | 138 | struct delayed_work jackdet_bootstrap; |
139 | 139 | ||
140 | int micdet_irq; | 140 | int micdet_irq; |
141 | wm1811_micdet_cb micd_cb; | ||
142 | void *micd_cb_data; | ||
141 | 143 | ||
142 | int revision; | 144 | int revision; |
143 | 145 | ||