diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-01 23:35:29 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-01 23:35:29 -0500 |
| commit | faa9c2a798d4be0d15b1e685c4da4be3e2782089 (patch) | |
| tree | 95a42ccd673084ecf18b42b33ddb85c52e501357 /include/linux/mfd/wm8994/pdata.h | |
| parent | e041e46907d2abaef8719f33379d3be4886c7088 (diff) | |
| parent | 72222be39afbd39c16eb180646b0ac44bb1ba460 (diff) | |
Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next
Diffstat (limited to 'include/linux/mfd/wm8994/pdata.h')
| -rw-r--r-- | include/linux/mfd/wm8994/pdata.h | 5 |
1 files changed, 5 insertions, 0 deletions
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 | */ |