diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2011-08-24 09:28:23 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-10-24 08:09:12 -0400 |
commit | 8aece6ab49dbc5646d6339eee424d1f944f54519 (patch) | |
tree | c473f084033210fb03c837bb30b5692a285c423e /arch/arm | |
parent | 8dd93eeee873d2383dbca4cca1983b6731efdb75 (diff) |
ARM: imx: use mc13xxx constants instead of mc13783
The latter constants are going to be removed in favour of the former
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-imx/mach-mx27_3ds.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx31_3ds.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 6fa6934ab150..38568554293a 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c | |||
@@ -293,8 +293,8 @@ static struct mc13xxx_platform_data mc13783_pdata = { | |||
293 | .num_regulators = ARRAY_SIZE(mx27_3ds_regulators), | 293 | .num_regulators = ARRAY_SIZE(mx27_3ds_regulators), |
294 | 294 | ||
295 | }, | 295 | }, |
296 | .flags = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN | | 296 | .flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN | |
297 | MC13783_USE_RTC, | 297 | MC13XXX_USE_RTC, |
298 | }; | 298 | }; |
299 | 299 | ||
300 | /* SPI */ | 300 | /* SPI */ |
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index c20be7530927..aa2ebe6bae34 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c | |||
@@ -494,7 +494,7 @@ static struct mc13xxx_platform_data mc13783_pdata = { | |||
494 | .regulators = mx31_3ds_regulators, | 494 | .regulators = mx31_3ds_regulators, |
495 | .num_regulators = ARRAY_SIZE(mx31_3ds_regulators), | 495 | .num_regulators = ARRAY_SIZE(mx31_3ds_regulators), |
496 | }, | 496 | }, |
497 | .flags = MC13783_USE_REGULATOR | MC13783_USE_TOUCHSCREEN, | 497 | .flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN, |
498 | }; | 498 | }; |
499 | 499 | ||
500 | /* SPI */ | 500 | /* SPI */ |
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 2d6a64bbac44..d033774ebf23 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
@@ -266,8 +266,8 @@ 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 | }, | 268 | }, |
269 | .flags = MC13783_USE_ADC | MC13783_USE_REGULATOR | | 269 | .flags = MC13XXX_USE_ADC | MC13XXX_USE_REGULATOR | |
270 | MC13783_USE_TOUCHSCREEN, | 270 | MC13XXX_USE_TOUCHSCREEN, |
271 | }; | 271 | }; |
272 | 272 | ||
273 | static struct spi_board_info pcm038_spi_board_info[] __initdata = { | 273 | static struct spi_board_info pcm038_spi_board_info[] __initdata = { |