aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mfd
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-03-09 12:02:55 +0000
committerSamuel Ortiz <sameo@linux.intel.com>2011-03-23 10:42:09 +0100
commit2edd3b692404efc2d3915175a2ed553e783de763 (patch)
treec2a6d4632ec08b567c24e345d638e656462c0135 /include/linux/mfd
parentmfd: Add a core driver for TI TPS61050/TPS61052 chips v2 (diff)
downloadlinux-dev-2edd3b692404efc2d3915175a2ed553e783de763.tar.xz
linux-dev-2edd3b692404efc2d3915175a2ed553e783de763.zip
regulator: Add a subdriver for TI TPS6105x regulator portions v2
This adds a subdriver for the regulator found inside the TPS61050 and TPS61052 chips. Cc: Samuel Ortiz <samuel.ortiz@intel.com> Cc: Ola Lilja <ola.o.lilja@stericsson.com> Cc: Jonas Aberg <jonas.aberg@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Acked-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/tps6105x.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/mfd/tps6105x.h b/include/linux/mfd/tps6105x.h
index f259244a56bd..386743dd931c 100644
--- a/include/linux/mfd/tps6105x.h
+++ b/include/linux/mfd/tps6105x.h
@@ -10,6 +10,7 @@
#define MFD_TPS6105X_H
#include <linux/i2c.h>
+#include <linux/regulator/machine.h>
/*
* Register definitions to all subdrivers
@@ -71,20 +72,25 @@ enum tps6105x_mode {
* struct tps6105x_platform_data - TPS61905x platform data
* @mode: what mode this instance shall be operated in,
* this is not selectable at runtime
+ * @regulator_data: initialization data for the voltage
+ * regulator if used as a voltage source
*/
struct tps6105x_platform_data {
enum tps6105x_mode mode;
+ struct regulator_init_data *regulator_data;
};
/**
* struct tps6105x - state holder for the TPS6105x drivers
* @mutex: mutex to serialize I2C accesses
* @i2c_client: corresponding I2C client
+ * @regulator: regulator device if used in voltage mode
*/
struct tps6105x {
struct tps6105x_platform_data *pdata;
struct mutex lock;
struct i2c_client *client;
+ struct regulator_dev *regulator;
};
extern int tps6105x_set(struct tps6105x *tps6105x, u8 reg, u8 value);