summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/mach-pcm038.c
diff options
context:
space:
mode:
authorDavid Jander <david@protonic.nl>2011-02-10 10:59:44 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-02-10 14:12:16 +0100
commit5836372e8a0ba5cc633f61bc0484ee20c86f4b36 (patch)
tree49495e92936b525abede4296717836373ab0327b /arch/arm/mach-imx/mach-pcm038.c
parentARM: mx3/mx31_3ds: fix compiler warning without CONFIG_USB_ULPI (diff)
downloadlinux-5836372e8a0ba5cc633f61bc0484ee20c86f4b36.tar.xz
linux-5836372e8a0ba5cc633f61bc0484ee20c86f4b36.zip
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.c8
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 = {
.consumer_supplies = cam_consumers,
};
-static struct mc13783_regulator_init_data pcm038_regulators[] = {
+static struct mc13xxx_regulator_init_data pcm038_regulators[] = {
{
.id = MC13783_REG_VCAM,
.init_data = &cam_data,
@@ -262,11 +262,11 @@ static struct mc13783_regulator_init_data pcm038_regulators[] = {
},
};
-static struct mc13783_platform_data pcm038_pmic = {
+static struct mc13xxx_platform_data pcm038_pmic = {
.regulators = pcm038_regulators,
.num_regulators = ARRAY_SIZE(pcm038_regulators),
- .flags = MC13783_USE_ADC | MC13783_USE_REGULATOR |
- MC13783_USE_TOUCHSCREEN,
+ .flags = MC13XXX_USE_ADC | MC13XXX_USE_REGULATOR |
+ MC13XXX_USE_TOUCHSCREEN,
};
static struct spi_board_info pcm038_spi_board_info[] __initdata = {