diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-17 08:02:27 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-08-22 07:25:15 -0400 |
commit | d6c645fc00777a6f8a7df1f580065ec30c71be7b (patch) | |
tree | 0dba18686fbfac44b7123b2a29b5b8e75b761346 /include/linux/mfd/wm8994 | |
parent | 5570c2f709bdc455a2e8907919c1214ca8a21859 (diff) |
mfd: Convert WM8994 to use new register map API
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd/wm8994')
-rw-r--r-- | include/linux/mfd/wm8994/core.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/linux/mfd/wm8994/core.h b/include/linux/mfd/wm8994/core.h index f0b69cdae41c..45df450d869f 100644 --- a/include/linux/mfd/wm8994/core.h +++ b/include/linux/mfd/wm8994/core.h | |||
@@ -24,6 +24,7 @@ enum wm8994_type { | |||
24 | 24 | ||
25 | struct regulator_dev; | 25 | struct regulator_dev; |
26 | struct regulator_bulk_data; | 26 | struct regulator_bulk_data; |
27 | struct regmap; | ||
27 | 28 | ||
28 | #define WM8994_NUM_GPIO_REGS 11 | 29 | #define WM8994_NUM_GPIO_REGS 11 |
29 | #define WM8994_NUM_LDO_REGS 2 | 30 | #define WM8994_NUM_LDO_REGS 2 |
@@ -50,18 +51,12 @@ struct regulator_bulk_data; | |||
50 | #define WM8994_IRQ_GPIO(x) (x + WM8994_IRQ_TEMP_WARN) | 51 | #define WM8994_IRQ_GPIO(x) (x + WM8994_IRQ_TEMP_WARN) |
51 | 52 | ||
52 | struct wm8994 { | 53 | struct wm8994 { |
53 | struct mutex io_lock; | ||
54 | struct mutex irq_lock; | 54 | struct mutex irq_lock; |
55 | 55 | ||
56 | enum wm8994_type type; | 56 | enum wm8994_type type; |
57 | 57 | ||
58 | struct device *dev; | 58 | struct device *dev; |
59 | int (*read_dev)(struct wm8994 *wm8994, unsigned short reg, | 59 | struct regmap *regmap; |
60 | int bytes, void *dest); | ||
61 | int (*write_dev)(struct wm8994 *wm8994, unsigned short reg, | ||
62 | int bytes, const void *src); | ||
63 | |||
64 | void *control_data; | ||
65 | 60 | ||
66 | int gpio_base; | 61 | int gpio_base; |
67 | int irq_base; | 62 | int irq_base; |