diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 19:04:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-05 19:04:09 -0800 |
| commit | 8e128ce3318a147903c893de1891f6c2306f8a61 (patch) | |
| tree | 3b45e780570e9beb9ec8e83c677f2d9fd9b458ce /include/linux/mfd/wm8350/comparator.h | |
| parent | 0bbb2753584231db364b624bf8cf82551b94da7d (diff) | |
| parent | 3f874b6643e189d3d07618928ceed0013d71593e (diff) | |
| download | op-kernel-dev-8e128ce3318a147903c893de1891f6c2306f8a61.zip op-kernel-dev-8e128ce3318a147903c893de1891f6c2306f8a61.tar.gz | |
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
* 'for-next' of git://git.o-hand.com/linux-mfd: (30 commits)
mfd: Fix section mismatch in da903x
mfd: move drivers/i2c/chips/menelaus.c to drivers/mfd
mfd: move drivers/i2c/chips/tps65010.c to drivers/mfd
mfd: dm355evm msp430 driver
mfd: Add missing break from wm3850-core
mfd: Add WM8351 support
mfd: Support configurable numbers of DCDCs and ISINKs on WM8350
mfd: Handle missing WM8350 platform data
mfd: Add WM8352 support
mfd: Use irq_to_desc in twl4030 code
power_supply: Add Dialog DA9030 battery charger driver
mfd: Dialog DA9030 battery charger MFD driver
mfd: Register WM8400 codec device
mfd: Pass driver_data onto child devices
mfd: Fix twl4030-core.c build error
mfd: twl4030 regulator bug fixes
mfd: twl4030: create some regulator devices
mfd: twl4030: cleanup symbols and OMAP dependency
mfd: twl4030: simplified child creation code
power_supply: Add battery health reporting for WM8350
...
Diffstat (limited to 'include/linux/mfd/wm8350/comparator.h')
| -rw-r--r-- | include/linux/mfd/wm8350/comparator.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/mfd/wm8350/comparator.h b/include/linux/mfd/wm8350/comparator.h index 0537886..54bc5d0 100644 --- a/include/linux/mfd/wm8350/comparator.h +++ b/include/linux/mfd/wm8350/comparator.h @@ -164,4 +164,12 @@ #define WM8350_AUXADC_BATT 6 #define WM8350_AUXADC_TEMP 7 +struct wm8350; + +/* + * AUX ADC Readback + */ +int wm8350_read_auxadc(struct wm8350 *wm8350, int channel, int scale, + int vref); + #endif |
