diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-02-23 06:08:06 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-03-07 16:17:34 -0500 |
commit | 473fe73650b9f92114edbedfbb616561c1a0026c (patch) | |
tree | 24e4a0ee61eb73b990055a6b0f427e430d4d5234 /include/linux/mfd | |
parent | d19663ac61a6e36eec655d3c84a106686ebddd2c (diff) |
mfd: Use completion interrupt for WM831x AUXADC
Use the completion interrupt generated by the device rather than
polling for conversions to complete. As a backup we still check
the status of the AUXADC if we don't get a completion, mostly for
systems that don't have the WM831x interrupt infrastructure hooked
up.
Also reduce the timeout for completion of conversions to 5ms from
the previous 10ms, the lower timeout should be sufficient.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd')
-rw-r--r-- | include/linux/mfd/wm831x/core.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h index 53580b592bc9..5915f6e3d9ab 100644 --- a/include/linux/mfd/wm831x/core.h +++ b/include/linux/mfd/wm831x/core.h | |||
@@ -15,6 +15,7 @@ | |||
15 | #ifndef __MFD_WM831X_CORE_H__ | 15 | #ifndef __MFD_WM831X_CORE_H__ |
16 | #define __MFD_WM831X_CORE_H__ | 16 | #define __MFD_WM831X_CORE_H__ |
17 | 17 | ||
18 | #include <linux/completion.h> | ||
18 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
19 | 20 | ||
20 | /* | 21 | /* |
@@ -261,6 +262,7 @@ struct wm831x { | |||
261 | int num_gpio; | 262 | int num_gpio; |
262 | 263 | ||
263 | struct mutex auxadc_lock; | 264 | struct mutex auxadc_lock; |
265 | struct completion auxadc_done; | ||
264 | 266 | ||
265 | /* The WM831x has a security key blocking access to certain | 267 | /* The WM831x has a security key blocking access to certain |
266 | * registers. The mutex is taken by the accessors for locking | 268 | * registers. The mutex is taken by the accessors for locking |