diff options
author | David Jander <david@protonic.nl> | 2011-02-10 04:59:44 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-02-10 08:12:16 -0500 |
commit | 5836372e8a0ba5cc633f61bc0484ee20c86f4b36 (patch) | |
tree | 49495e92936b525abede4296717836373ab0327b /arch/arm/mach-imx/mach-pcm038.c | |
parent | 0be9a196468ad4d03a3f5a1823e02aad5be47968 (diff) |
ARM: imx+mx3: convert to mc13xxx MFD
Signed-off-by: David Jander <david@protonic.nl>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx/mach-pcm038.c')
-rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 505614803bc6..ca20117d6067 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
@@ -252,7 +252,7 @@ static struct regulator_init_data cam_data = { | |||
252 | .consumer_supplies = cam_consumers, | 252 | .consumer_supplies = cam_consumers, |
253 | }; | 253 | }; |
254 | 254 | ||
255 | static struct mc13783_regulator_init_data pcm038_regulators[] = { | 255 | static struct mc13xxx_regulator_init_data pcm038_regulators[] = { |
256 | { | 256 | { |
257 | .id = MC13783_REG_VCAM, | 257 | .id = MC13783_REG_VCAM, |
258 | .init_data = &cam_data, | 258 | .init_data = &cam_data, |
@@ -262,11 +262,11 @@ static struct mc13783_regulator_init_data pcm038_regulators[] = { | |||
262 | }, | 262 | }, |
263 | }; | 263 | }; |
264 | 264 | ||
265 | static struct mc13783_platform_data pcm038_pmic = { | 265 | static struct mc13xxx_platform_data pcm038_pmic = { |
266 | .regulators = pcm038_regulators, | 266 | .regulators = pcm038_regulators, |
267 | .num_regulators = ARRAY_SIZE(pcm038_regulators), | 267 | .num_regulators = ARRAY_SIZE(pcm038_regulators), |
268 | .flags = MC13783_USE_ADC | MC13783_USE_REGULATOR | | 268 | .flags = MC13XXX_USE_ADC | MC13XXX_USE_REGULATOR | |
269 | MC13783_USE_TOUCHSCREEN, | 269 | MC13XXX_USE_TOUCHSCREEN, |
270 | }; | 270 | }; |
271 | 271 | ||
272 | static struct spi_board_info pcm038_spi_board_info[] __initdata = { | 272 | static struct spi_board_info pcm038_spi_board_info[] __initdata = { |