diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:37 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:37 +0900 |
| commit | 06f1c66324cc38f0a38e4714f4645758742d7b3f (patch) | |
| tree | c3fcf1770f9004813eec7504cd2c4301f16ef388 /include | |
| parent | 6f5716a214ca2342f6311ddc5fc214ddc813753a (diff) | |
| parent | 98869f68f2f68a9f238f5e96dbc3f838a0ff7136 (diff) | |
| download | linux-06f1c66324cc38f0a38e4714f4645758742d7b3f.tar.gz linux-06f1c66324cc38f0a38e4714f4645758742d7b3f.tar.bz2 linux-06f1c66324cc38f0a38e4714f4645758742d7b3f.zip | |
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/wm8994/core.h | 4 | ||||
| -rw-r--r-- | include/linux/mfd/wm8994/pdata.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h index 1f173306bf05..ae5c249530b4 100644 --- a/include/linux/mfd/wm8994/core.h +++ b/include/linux/mfd/wm8994/core.h @@ -19,6 +19,8 @@ #include <linux/interrupt.h> #include <linux/regmap.h> +#include <linux/mfd/wm8994/pdata.h> + enum wm8994_type { WM8994 = 0, WM8958 = 1, @@ -55,6 +57,8 @@ struct regulator_bulk_data; struct wm8994 { struct mutex irq_lock; + struct wm8994_pdata pdata; + enum wm8994_type type; int revision; int cust_id; diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h index fc87be4fdc25..8e21a094836d 100644 --- a/include/linux/mfd/wm8994/pdata.h +++ b/include/linux/mfd/wm8994/pdata.h @@ -176,6 +176,11 @@ struct wm8994_pdata { unsigned int lineout1fb:1; unsigned int lineout2fb:1; + /* Delay between detecting a jack and starting microphone + * detect (specified in ms) + */ + int micdet_delay; + /* IRQ for microphone detection if brought out directly as a * signal. */ |