aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Rétornaz <philippe.retornaz@epfl.ch>2011-09-18 11:52:33 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2011-10-24 08:09:14 -0400
commit46621ebbf5859375dc1fd4dc21d400224032fbf9 (patch)
tree6e1b866aa2ce27280c86772e6e167e4bb0d30af5
parentf20a5ea8e3aa8cb5cfe74bd8705dbb609a24783c (diff)
ARM: imx+mc13xxx: remove obsolete leds and regulators flags
Signed-off-by: Philippe Rétornaz <philippe.retornaz@epfl.ch> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--arch/arm/mach-imx/mach-mx27_3ds.c3
-rw-r--r--arch/arm/mach-imx/mach-mx31_3ds.c2
-rw-r--r--arch/arm/mach-imx/mach-mx31lite.c3
-rw-r--r--arch/arm/mach-imx/mach-mx31moboard.c3
-rw-r--r--arch/arm/mach-imx/mach-pcm038.c3
-rw-r--r--arch/arm/mach-mx5/mx51_efika.c2
6 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index 38568554293a..535bfebb20cf 100644
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -293,8 +293,7 @@ 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 = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN | 296 .flags = MC13XXX_USE_TOUCHSCREEN | MC13XXX_USE_RTC,
297 MC13XXX_USE_RTC,
298}; 297};
299 298
300/* SPI */ 299/* SPI */
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index aa2ebe6bae34..7d078b4320c2 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 = MC13XXX_USE_REGULATOR | MC13XXX_USE_TOUCHSCREEN, 497 .flags = MC13XXX_USE_TOUCHSCREEN,
498}; 498};
499 499
500/* SPI */ 500/* SPI */
diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c
index 4b47fd9fdd89..0ea0bdaf74c3 100644
--- a/arch/arm/mach-imx/mach-mx31lite.c
+++ b/arch/arm/mach-imx/mach-mx31lite.c
@@ -112,8 +112,7 @@ static const struct spi_imx_master spi1_pdata __initconst = {
112}; 112};
113 113
114static struct mc13xxx_platform_data mc13783_pdata __initdata = { 114static struct mc13xxx_platform_data mc13783_pdata __initdata = {
115 .flags = MC13XXX_USE_RTC | 115 .flags = MC13XXX_USE_RTC,
116 MC13XXX_USE_REGULATOR,
117}; 116};
118 117
119static struct spi_board_info mc13783_spi_dev __initdata = { 118static struct spi_board_info mc13783_spi_dev __initdata = {
diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c
index b358383120e7..8067f8196228 100644
--- a/arch/arm/mach-imx/mach-mx31moboard.c
+++ b/arch/arm/mach-imx/mach-mx31moboard.c
@@ -270,8 +270,7 @@ static struct mc13xxx_platform_data moboard_pmic = {
270 .num_regulators = ARRAY_SIZE(moboard_regulators), 270 .num_regulators = ARRAY_SIZE(moboard_regulators),
271 }, 271 },
272 .leds = &moboard_leds, 272 .leds = &moboard_leds,
273 .flags = MC13XXX_USE_REGULATOR | MC13XXX_USE_RTC | 273 .flags = MC13XXX_USE_RTC | MC13XXX_USE_ADC,
274 MC13XXX_USE_ADC | MC13XXX_USE_LED,
275}; 274};
276 275
277static struct spi_board_info moboard_spi_board_info[] __initdata = { 276static struct spi_board_info moboard_spi_board_info[] __initdata = {
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c
index d033774ebf23..5ef49de326a2 100644
--- a/arch/arm/mach-imx/mach-pcm038.c
+++ b/arch/arm/mach-imx/mach-pcm038.c
@@ -266,8 +266,7 @@ 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 = MC13XXX_USE_ADC | MC13XXX_USE_REGULATOR | 269 .flags = MC13XXX_USE_ADC | MC13XXX_USE_TOUCHSCREEN,
270 MC13XXX_USE_TOUCHSCREEN,
271}; 270};
272 271
273static struct spi_board_info pcm038_spi_board_info[] __initdata = { 272static struct spi_board_info pcm038_spi_board_info[] __initdata = {
diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c
index c9209454807a..8e1ded2420bc 100644
--- a/arch/arm/mach-mx5/mx51_efika.c
+++ b/arch/arm/mach-mx5/mx51_efika.c
@@ -567,7 +567,7 @@ static struct mc13xxx_regulator_init_data mx51_efika_regulators[] = {
567}; 567};
568 568
569static struct mc13xxx_platform_data mx51_efika_mc13892_data = { 569static struct mc13xxx_platform_data mx51_efika_mc13892_data = {
570 .flags = MC13XXX_USE_RTC | MC13XXX_USE_REGULATOR, 570 .flags = MC13XXX_USE_RTC,
571 .regulators = { 571 .regulators = {
572 .num_regulators = ARRAY_SIZE(mx51_efika_regulators), 572 .num_regulators = ARRAY_SIZE(mx51_efika_regulators),
573 .regulators = mx51_efika_regulators, 573 .regulators = mx51_efika_regulators,