summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLaxman Dewangan <ldewangan@nvidia.com>2012-08-02 13:34:01 +0530
committerSimone Willett <swillett@nvidia.com>2012-08-02 18:03:10 -0700
commitd88c5cce18adf50d472508e38fced959b845e7d8 (patch)
treebf34a12f2731e1b861cb20e9fade09cbd8296cf6 /include
parent5f436b65eb7d71b85e1dd1ffd58410ebbda01a74 (diff)
regulator: tps80031: register regulators as mfd sub device
Converting tps80031 regulator driver to be register as mfd sub device of the tps65910 and register all its regulators from single probe calls. Add separate platform data for the regulator to be supply from board as part of tps80031 platform data. Change-Id: Ie65b25f3058202070f7f917e64a4a660dd941210 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/119976
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/tps80031.h2
-rw-r--r--include/linux/regulator/tps80031-regulator.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mfd/tps80031.h b/include/linux/mfd/tps80031.h
index b3b9480ce596..974fc0db0ff2 100644
--- a/include/linux/mfd/tps80031.h
+++ b/include/linux/mfd/tps80031.h
@@ -197,6 +197,8 @@ struct tps80031_platform_data {
bool use_power_off;
struct tps80031_pupd_init_data *pupd_init_data;
int pupd_init_data_size;
+ struct tps80031_regulator_platform_data **regulator_pdata;
+ int num_regulator_pdata;
};
struct tps80031_bg_platform_data {
diff --git a/include/linux/regulator/tps80031-regulator.h b/include/linux/regulator/tps80031-regulator.h
index 4058f7cfa27a..97fdf34c1b6e 100644
--- a/include/linux/regulator/tps80031-regulator.h
+++ b/include/linux/regulator/tps80031-regulator.h
@@ -66,6 +66,7 @@ enum {
/*
* struct tps80031_regulator_platform_data - tps80031 regulator platform data.
*
+ * @regulator_id" Regulator ID.
* @reg_init_data: The regulator init data.
* @init_uV: initial micro volts which need to be set.
* @init_enable: Enable or do not enable the rails during initialization.
@@ -80,6 +81,7 @@ enum {
*/
struct tps80031_regulator_platform_data {
+ int regulator_id;
struct regulator_init_data *reg_init_data;
int init_uV;
unsigned init_enable:1;