diff options
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 1f173306bf0..ae5c249530b 100644 --- a/include/linux/mfd/wm8994/core.h +++ b/include/linux/mfd/wm8994/core.h | |||
| @@ -19,6 +19,8 @@ | |||
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/regmap.h> | 20 | #include <linux/regmap.h> |
| 21 | 21 | ||
| 22 | #include <linux/mfd/wm8994/pdata.h> | ||
| 23 | |||
| 22 | enum wm8994_type { | 24 | enum wm8994_type { |
| 23 | WM8994 = 0, | 25 | WM8994 = 0, |
| 24 | WM8958 = 1, | 26 | WM8958 = 1, |
| @@ -55,6 +57,8 @@ struct regulator_bulk_data; | |||
| 55 | struct wm8994 { | 57 | struct wm8994 { |
| 56 | struct mutex irq_lock; | 58 | struct mutex irq_lock; |
| 57 | 59 | ||
| 60 | struct wm8994_pdata pdata; | ||
| 61 | |||
| 58 | enum wm8994_type type; | 62 | enum wm8994_type type; |
| 59 | int revision; | 63 | int revision; |
| 60 | int cust_id; | 64 | int cust_id; |
diff --git a/include/linux/mfd/wm8994/pdata.h b/include/linux/mfd/wm8994/pdata.h index fc87be4fdc2..8e21a094836 100644 --- a/include/linux/mfd/wm8994/pdata.h +++ b/include/linux/mfd/wm8994/pdata.h | |||
| @@ -176,6 +176,11 @@ struct wm8994_pdata { | |||
| 176 | unsigned int lineout1fb:1; | 176 | unsigned int lineout1fb:1; |
| 177 | unsigned int lineout2fb:1; | 177 | unsigned int lineout2fb:1; |
| 178 | 178 | ||
| 179 | /* Delay between detecting a jack and starting microphone | ||
| 180 | * detect (specified in ms) | ||
| 181 | */ | ||
| 182 | int micdet_delay; | ||
| 183 | |||
| 179 | /* IRQ for microphone detection if brought out directly as a | 184 | /* IRQ for microphone detection if brought out directly as a |
| 180 | * signal. | 185 | * signal. |
| 181 | */ | 186 | */ |
