aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2008-11-07 19:10:21 -0500
committerSamuel Ortiz <samuel@sortiz.org>2009-01-04 06:17:38 -0500
commit67488526349d043372d141c054f4dc6313780b3c (patch)
tree22db1f6609edd7945fb000b4a9c48e86aadf3dfb /include
parent0c8a601678960fbcc1c1185a283d6d107575810b (diff)
mfd: Add AUXADC support for WM8350
The auxiliary ADC in the WM8350 is shared between several subdevices so access to it needs to be arbitrated by the core driver. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Samuel Ortiz <sameo@openedhand.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/wm8350/comparator.h8
-rw-r--r--include/linux/mfd/wm8350/core.h2
2 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/mfd/wm8350/comparator.h b/include/linux/mfd/wm8350/comparator.h
index 053788649452..54bc5d0fd502 100644
--- a/include/linux/mfd/wm8350/comparator.h
+++ b/include/linux/mfd/wm8350/comparator.h
@@ -164,4 +164,12 @@
164#define WM8350_AUXADC_BATT 6 164#define WM8350_AUXADC_BATT 6
165#define WM8350_AUXADC_TEMP 7 165#define WM8350_AUXADC_TEMP 7
166 166
167struct wm8350;
168
169/*
170 * AUX ADC Readback
171 */
172int wm8350_read_auxadc(struct wm8350 *wm8350, int channel, int scale,
173 int vref);
174
167#endif 175#endif
diff --git a/include/linux/mfd/wm8350/core.h b/include/linux/mfd/wm8350/core.h
index 9490ec175d5a..cc190055b9c4 100644
--- a/include/linux/mfd/wm8350/core.h
+++ b/include/linux/mfd/wm8350/core.h
@@ -573,6 +573,8 @@ struct wm8350 {
573 void *src); 573 void *src);
574 u16 *reg_cache; 574 u16 *reg_cache;
575 575
576 struct mutex auxadc_mutex;
577
576 /* Interrupt handling */ 578 /* Interrupt handling */
577 struct work_struct irq_work; 579 struct work_struct irq_work;
578 struct mutex irq_mutex; /* IRQ table mutex */ 580 struct mutex irq_mutex; /* IRQ table mutex */