diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 08:35:29 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-02 08:35:29 +0400 |
| commit | faa9c2a798d4be0d15b1e685c4da4be3e2782089 (patch) | |
| tree | 95a42ccd673084ecf18b42b33ddb85c52e501357 /include | |
| parent | e041e46907d2abaef8719f33379d3be4886c7088 (diff) | |
| parent | 72222be39afbd39c16eb180646b0ac44bb1ba460 (diff) | |
| download | linux-faa9c2a798d4be0d15b1e685c4da4be3e2782089.tar.xz | |
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. */ |