Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4e67bbc authored by Lee Jones's avatar Lee Jones Committed by Mark Brown
Browse files

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



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: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent d3193103

arch/arm/mach-ux500/board-mop500.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -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,

};

};

include/linux/mfd/abx500/ab8500.h

+2 −9
Original line number Original line Diff line number Diff line
@@ -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;