diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-19 17:57:56 -0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-10-28 18:30:24 -0400 |
| commit | e5b486841d572c5ac83c798f82f4f67cbbac5320 (patch) | |
| tree | 162b0c3f058fb461515a06614711a717d6807bb8 /include/linux/mfd | |
| parent | 00969f23dae70f62d7ce3f7abbbfb6d09ef92739 (diff) | |
mfd: Factor out WM831x I2C I/O from the core driver
In preparation for the addition of SPI support for the WM831x move the I2C
specific code into a separate file with a separate Kconfig option so the
I2C support can be excluded from the build.
Also update the 1133-EV1 PMIC module support for SMDK6410 to use the new
symbol.
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 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/mfd/wm831x/core.h b/include/linux/mfd/wm831x/core.h index eb5bd4e0e03c..a1239c48b41a 100644 --- a/include/linux/mfd/wm831x/core.h +++ b/include/linux/mfd/wm831x/core.h | |||
| @@ -238,6 +238,15 @@ struct regulator_dev; | |||
| 238 | 238 | ||
| 239 | #define WM831X_NUM_IRQ_REGS 5 | 239 | #define WM831X_NUM_IRQ_REGS 5 |
| 240 | 240 | ||
| 241 | enum wm831x_parent { | ||
| 242 | WM8310 = 0x8310, | ||
| 243 | WM8311 = 0x8311, | ||
| 244 | WM8312 = 0x8312, | ||
| 245 | WM8320 = 0x8320, | ||
| 246 | WM8321 = 0x8321, | ||
| 247 | WM8325 = 0x8325, | ||
| 248 | }; | ||
| 249 | |||
| 241 | struct wm831x { | 250 | struct wm831x { |
| 242 | struct mutex io_lock; | 251 | struct mutex io_lock; |
| 243 | 252 | ||
| @@ -285,6 +294,9 @@ int wm831x_set_bits(struct wm831x *wm831x, unsigned short reg, | |||
| 285 | int wm831x_bulk_read(struct wm831x *wm831x, unsigned short reg, | 294 | int wm831x_bulk_read(struct wm831x *wm831x, unsigned short reg, |
| 286 | int count, u16 *buf); | 295 | int count, u16 *buf); |
| 287 | 296 | ||
| 297 | int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq); | ||
| 298 | void wm831x_device_exit(struct wm831x *wm831x); | ||
| 299 | int wm831x_device_suspend(struct wm831x *wm831x); | ||
| 288 | int wm831x_irq_init(struct wm831x *wm831x, int irq); | 300 | int wm831x_irq_init(struct wm831x *wm831x, int irq); |
| 289 | void wm831x_irq_exit(struct wm831x *wm831x); | 301 | void wm831x_irq_exit(struct wm831x *wm831x); |
| 290 | 302 | ||
