Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 19:31:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: ux500: Pass regulator platform data using the new format

Browse Source 
Regulator platform data is now passed though a single structure
as opposed to the old way where four separate struct elements
were required. This patch makes use of the new format.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Lee Jones 2013-04-02 13:24:19 +01:00 committed by Mark Brown
parent d319310395
commit c4e67bbc99
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-ux500/board-mop500.c
View File

@ -198,10 +198,7 @@ static struct platform_device snowball_sbnet_dev = {
struct ab8500_platform_data ab8500_platdata = { struct ab8500_platform_data ab8500_platdata = {
.irq_base = MOP500_AB8500_IRQ_BASE, .irq_base = MOP500_AB8500_IRQ_BASE,
.regulator_reg_init = ab8500_regulator_reg_init, .regulator = &ab8500_regulator_plat_data,
.num_regulator_reg_init = ARRAY_SIZE(ab8500_regulator_reg_init),
.regulator = ab8500_regulators,
.num_regulator = ARRAY_SIZE(ab8500_regulators),
.gpio = &ab8500_gpio_pdata, .gpio = &ab8500_gpio_pdata,
.codec = &ab8500_codec_pdata, .codec = &ab8500_codec_pdata,
}; };

11
include/linux/mfd/abx500/ab8500.h
View File

@ -364,8 +364,7 @@ struct ab8500 {
const int *irq_reg_offset; const int *irq_reg_offset;
}; };
struct regulator_reg_init; struct ab8500_regulator_platform_data;
struct regulator_init_data;
struct ab8500_gpio_platform_data; struct ab8500_gpio_platform_data;
struct ab8500_codec_platform_data; struct ab8500_codec_platform_data;
struct ab8500_sysctrl_platform_data; struct ab8500_sysctrl_platform_data;
@ -375,19 +374,13 @@ struct ab8500_sysctrl_platform_data;
* @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used * @irq_base: start of AB8500 IRQs, AB8500_NR_IRQS will be used
* @pm_power_off: Should machine pm power off hook be registered or not * @pm_power_off: Should machine pm power off hook be registered or not
* @init: board-specific initialization after detection of ab8500 * @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 * @regulator: machine-specific constraints for regulators
*/ */
struct ab8500_platform_data { struct ab8500_platform_data {
int irq_base; int irq_base;
bool pm_power_off; bool pm_power_off;
void (*init) (struct ab8500 *); void (*init) (struct ab8500 *);
int num_regulator_reg_init; struct ab8500_regulator_platform_data *regulator;
struct ab8500_regulator_reg_init *regulator_reg_init;
int num_regulator;
struct regulator_init_data *regulator;
struct abx500_gpio_platform_data *gpio; struct abx500_gpio_platform_data *gpio;
struct ab8500_codec_platform_data *codec; struct ab8500_codec_platform_data *codec;
struct ab8500_sysctrl_platform_data *sysctrl; struct ab8500_sysctrl_platform_data *sysctrl;