diff options
| author | Bengt Jonsson <bengt.g.jonsson@stericsson.com> | 2011-10-04 10:56:48 +0200 |
|---|---|---|
| committer | Yvan FILLION <yvan.fillion@stericsson.com> | 2011-10-11 15:33:36 +0200 |
| commit | 70bb59cdc42f53f02acd9f7fcdeb111729257b17 (patch) | |
| tree | 838272d7ff6d6c298430bcf9fd59caa32f9cba0d /include/linux | |
| parent | ab10e9e7b56effea56f35658d182ec02e6c79e67 (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/linux')
| -rw-r--r-- | include/linux/mfd/ab8500.h | 11 | ||||
| -rw-r--r-- | include/linux/regulator/ab8500.h | 7 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/ab8500.h index 8908dd989f9..424bdc81f68 100644 --- a/include/linux/mfd/ab8500.h +++ b/include/linux/mfd/ab8500.h @@ -171,8 +171,7 @@ struct ab8500 { u8 oldmask[AB8500_NUM_IRQ_REGS]; }; -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; @@ -186,9 +185,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 @@ -202,10 +198,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; diff --git a/include/linux/regulator/ab8500.h b/include/linux/regulator/ab8500.h index 89b5b0abf82..095d94af589 100644 --- a/include/linux/regulator/ab8500.h +++ b/include/linux/regulator/ab8500.h @@ -86,4 +86,11 @@ enum ab8500_regulator_reg { AB8500_NUM_REGULATOR_REGISTERS, }; +struct ab8500_regulator_platform_data { + int num_reg_init; + struct ab8500_regulator_reg_init *reg_init; + int num_regulator; + struct regulator_init_data *regulator; +}; + #endif |