Merge branch 'regmap-mfd' into regmap-next

3 files changed, 9 insertions, 16 deletions

diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h
index 8dda8ded5cda..44acdb25681b 100644
--- a/include/linux/mfd/wm831x/core.h
+++ b/include/linux/mfd/wm831x/core.h
@@ -18,6 +18,7 @@
 #include <linux/completion.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
+#include <linux/regmap.h>
 
 /*
  * Register values.
@@ -361,12 +362,8 @@ struct wm831x {
         struct mutex io_lock;
 
         struct device *dev;
-        int (*read_dev)(struct wm831x *wm831x, unsigned short reg,
-                        int bytes, void *dest);
-        int (*write_dev)(struct wm831x *wm831x, unsigned short reg,
-                         int bytes, void *src);
 
-        void *control_data;
+        struct regmap *regmap;
 
         int irq;  /* Our chip IRQ */
         struct mutex irq_lock;
@@ -416,4 +413,6 @@ int wm831x_irq_init(struct wm831x *wm831x, int irq);
 void wm831x_irq_exit(struct wm831x *wm831x);
 void wm831x_auxadc_init(struct wm831x *wm831x);
 
+extern struct regmap_config wm831x_regmap_config;
+
 #endif
diff --git a/include/linux/mfd/wm8400-private.h b/include/linux/mfd/wm8400-private.h
index 2aab4e93a5c9..0147b6968510 100644
--- a/include/linux/mfd/wm8400-private.h
+++ b/include/linux/mfd/wm8400-private.h
@@ -25,16 +25,15 @@
 #include <linux/mutex.h>
 #include <linux/platform_device.h>
 
+struct regmap;
+
 #define WM8400_REGISTER_COUNT 0x55
 
 struct wm8400 {
         struct device *dev;
 
-        int (*read_dev)(void *data, char reg, int count, u16 *dst);
-        int (*write_dev)(void *data, char reg, int count, const u16 *src);
-
         struct mutex io_lock;
-        void *io_data;
+        struct regmap *regmap;
 
         u16 reg_cache[WM8400_REGISTER_COUNT];
 
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 {
 
 struct regulator_dev;
 struct regulator_bulk_data;
+struct regmap;
 
 #define WM8994_NUM_GPIO_REGS 11
 #define WM8994_NUM_LDO_REGS   2
@@ -50,18 +51,12 @@ struct regulator_bulk_data;
 #define WM8994_IRQ_GPIO(x) (x + WM8994_IRQ_TEMP_WARN)
 
 struct wm8994 {
-        struct mutex io_lock;
         struct mutex irq_lock;
 
         enum wm8994_type type;
 
         struct device *dev;
-        int (*read_dev)(struct wm8994 *wm8994, unsigned short reg,
-                        int bytes, void *dest);
-        int (*write_dev)(struct wm8994 *wm8994, unsigned short reg,
-                         int bytes, const void *src);
-
-        void *control_data;
+        struct regmap *regmap;
 
         int gpio_base;
         int irq_base;