From d88c5cce18adf50d472508e38fced959b845e7d8 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Thu, 2 Aug 2012 13:34:01 +0530 Subject: 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 Reviewed-on: http://git-master/r/119976 --- include/linux/mfd/tps80031.h | 2 ++ include/linux/regulator/tps80031-regulator.h | 2 ++ 2 files changed, 4 insertions(+) (limited to 'include') 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; -- cgit v1.2.3