summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-05-02 15:54:42 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-05-09 21:55:45 +0200
commit5af7df6b831ef9fd5fbde9d4bbd596f742cb2ad8 (patch)
tree83e1369eafeb492e0c53293870d2c9a137fc0399 /include
parentmfd: enable wakeup on twl4030 IRQ. (diff)
downloadlinux-5af7df6b831ef9fd5fbde9d4bbd596f742cb2ad8.tar.xz
linux-5af7df6b831ef9fd5fbde9d4bbd596f742cb2ad8.zip
mfd: Add regulator support for twl6040 VIO, V2V1 supplies
twl6040 has three power supply source: VBAT needs to be connected to VBAT, VIO, and V2V1. Add regulator support for the VIO, V2V1 supplies. Initially handle the two supply together with bulk commands. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Reviewed-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Tero Kristo <t-kristo@ti.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/twl6040.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h
index b15b5f03f5c4..6659487c31e7 100644
--- a/include/linux/mfd/twl6040.h
+++ b/include/linux/mfd/twl6040.h
@@ -27,6 +27,7 @@
#include <linux/interrupt.h>
#include <linux/mfd/core.h>
+#include <linux/regulator/consumer.h>
#define TWL6040_REG_ASICID 0x01
#define TWL6040_REG_ASICREV 0x02
@@ -203,6 +204,7 @@ struct regmap;
struct twl6040 {
struct device *dev;
struct regmap *regmap;
+ struct regulator_bulk_data supplies[2]; /* supplies for vio, v2v1 */
struct mutex mutex;
struct mutex io_mutex;
struct mutex irq_mutex;