summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBengt Jonsson <bengt.g.jonsson@stericsson.com>2011-10-04 10:56:48 +0200
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:01:05 +0200
commite3273c04ff2dc6aa1f6b0be2876f4093bea6efab (patch)
tree97f027e104c687a974417627bd52ddd559aa1376 /include
parentf38d0b775ee6c885fe207b6a3a03f0d4c953dbd4 (diff)
ab8500: Separate regulator and MFD platform data
The ab8500 MFD should not have knowledge about regulator- specific platform data like number of regulators and regulator registers. As the regulator platform data is about to grow with external regulators, this information is moved to a new structure provided by the regulator driver. ST-Ericsson ID: 282517 ST-Ericsson Linux next: - ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I77d03ffcc3273b0659dea3cffd8191b8c94b83d2 Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33615 Reviewed-by: QABUILD Reviewed-by: Yvan FILLION <yvan.fillion@stericsson.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/mfd/abx500/ab8500.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/linux/mfd/abx500/ab8500.h b/include/linux/mfd/abx500/ab8500.h
index e7309e5e231..a8ee912bf69 100644
--- a/include/linux/mfd/abx500/ab8500.h
+++ b/include/linux/mfd/abx500/ab8500.h
@@ -258,8 +258,7 @@ struct ab8500 {
struct ab8500_charger *charger;
};
-struct regulator_reg_init;
-struct regulator_init_data;
+struct ab8500_regulator_platform_data;
struct ab8500_accdet_platform_data;
struct ab8500_denc_platform_data;
struct ab8500_audio_platform_data;
@@ -273,9 +272,6 @@ struct ab8500_gpio_platform_data;
* @thermal_time_out: Time out before the thermal alarm should be ignored
* @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used
* @init: board-specific initialization after detection of ab8500
- * @num_regulator_reg_init: number of regulator init registers
- * @regulator_reg_init: regulator init registers
- * @num_regulator: number of regulators
* @regulator: machine-specific constraints for regulators
* @accdet: machine-specific Accessory detection data
* @battery: machine-specific battery management data
@@ -289,10 +285,7 @@ struct ab8500_platform_data {
long thermal_set_time_sec;
long thermal_time_out;
void (*init) (struct ab8500 *);
- int num_regulator_reg_init;
- struct ab8500_regulator_reg_init *regulator_reg_init;
- int num_regulator;
- struct regulator_init_data *regulator;
+ struct ab8500_regulator_platform_data *regulator;
struct abx500_accdet_platform_data *accdet;
struct ab8500_bm_data *battery;
struct ab8500_denc_platform_data *denc;