diff options
| author | Oleg Drokin <green@linuxhacker.ru> | 2011-06-06 14:57:07 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-14 07:46:26 -0400 |
| commit | 786b01a8c1db0c0decca55d660a2a3ebd7cfb26b (patch) | |
| tree | fde9e94c10d61e712c5e3b893e5c1dc5c82e723b /arch/arm/mach-omap2/board-overo.c | |
| parent | 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff) | |
cleanup regulator supply definitions in mach-omap2
to use REGULATOR_SUPPLY arrays.
CC: Mark Brown <broonie@opensource.wolfsonmicro.com>
CC: Mike Rapoport <mike@compulab.co.il>
CC: Nishant Kamat <nskamat@ti.com>
CC: Steve Sakoman <steve@sakoman.com>
CC: Felipe Balbi <balbi@ti.com>
CC: Santosh Shilimkar <santosh.shilimkar@ti.com>
CC: peter.barada@logicpd.com
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-overo.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-overo.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 175e1ab2b04d..30c7556d251e 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c | |||
| @@ -74,15 +74,16 @@ | |||
| 74 | defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) | 74 | defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE) |
| 75 | 75 | ||
| 76 | /* fixed regulator for ads7846 */ | 76 | /* fixed regulator for ads7846 */ |
| 77 | static struct regulator_consumer_supply ads7846_supply = | 77 | static struct regulator_consumer_supply ads7846_supply[] = { |
| 78 | REGULATOR_SUPPLY("vcc", "spi1.0"); | 78 | REGULATOR_SUPPLY("vcc", "spi1.0"), |
| 79 | }; | ||
| 79 | 80 | ||
| 80 | static struct regulator_init_data vads7846_regulator = { | 81 | static struct regulator_init_data vads7846_regulator = { |
| 81 | .constraints = { | 82 | .constraints = { |
| 82 | .valid_ops_mask = REGULATOR_CHANGE_STATUS, | 83 | .valid_ops_mask = REGULATOR_CHANGE_STATUS, |
| 83 | }, | 84 | }, |
| 84 | .num_consumer_supplies = 1, | 85 | .num_consumer_supplies = ARRAY_SIZE(ads7846_supply), |
| 85 | .consumer_supplies = &ads7846_supply, | 86 | .consumer_supplies = ads7846_supply, |
| 86 | }; | 87 | }; |
| 87 | 88 | ||
| 88 | static struct fixed_voltage_config vads7846 = { | 89 | static struct fixed_voltage_config vads7846 = { |
| @@ -264,8 +265,9 @@ static struct omap_dss_board_info overo_dss_data = { | |||
| 264 | .default_device = &overo_dvi_device, | 265 | .default_device = &overo_dvi_device, |
| 265 | }; | 266 | }; |
| 266 | 267 | ||
| 267 | static struct regulator_consumer_supply overo_vdda_dac_supply = | 268 | static struct regulator_consumer_supply overo_vdda_dac_supply[] = { |
| 268 | REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"); | 269 | REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"), |
| 270 | }; | ||
| 269 | 271 | ||
| 270 | static struct regulator_consumer_supply overo_vdds_dsi_supply[] = { | 272 | static struct regulator_consumer_supply overo_vdds_dsi_supply[] = { |
| 271 | REGULATOR_SUPPLY("vdds_dsi", "omapdss"), | 273 | REGULATOR_SUPPLY("vdds_dsi", "omapdss"), |
| @@ -319,8 +321,8 @@ static struct omap2_hsmmc_info mmc[] = { | |||
| 319 | {} /* Terminator */ | 321 | {} /* Terminator */ |
| 320 | }; | 322 | }; |
| 321 | 323 | ||
| 322 | static struct regulator_consumer_supply overo_vmmc1_supply = { | 324 | static struct regulator_consumer_supply overo_vmmc1_supply[] = { |
| 323 | .supply = "vmmc", | 325 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), |
| 324 | }; | 326 | }; |
| 325 | 327 | ||
| 326 | #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) | 328 | #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) |
| @@ -447,8 +449,8 @@ static struct regulator_init_data overo_vmmc1 = { | |||
| 447 | | REGULATOR_CHANGE_MODE | 449 | | REGULATOR_CHANGE_MODE |
| 448 | | REGULATOR_CHANGE_STATUS, | 450 | | REGULATOR_CHANGE_STATUS, |
| 449 | }, | 451 | }, |
| 450 | .num_consumer_supplies = 1, | 452 | .num_consumer_supplies = ARRAY_SIZE(overo_vmmc1_supply), |
| 451 | .consumer_supplies = &overo_vmmc1_supply, | 453 | .consumer_supplies = overo_vmmc1_supply, |
| 452 | }; | 454 | }; |
| 453 | 455 | ||
| 454 | /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ | 456 | /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ |
| @@ -461,8 +463,8 @@ static struct regulator_init_data overo_vdac = { | |||
| 461 | .valid_ops_mask = REGULATOR_CHANGE_MODE | 463 | .valid_ops_mask = REGULATOR_CHANGE_MODE |
| 462 | | REGULATOR_CHANGE_STATUS, | 464 | | REGULATOR_CHANGE_STATUS, |
| 463 | }, | 465 | }, |
| 464 | .num_consumer_supplies = 1, | 466 | .num_consumer_supplies = ARRAY_SIZE(overo_vdda_dac_supply), |
| 465 | .consumer_supplies = &overo_vdda_dac_supply, | 467 | .consumer_supplies = overo_vdda_dac_supply, |
| 466 | }; | 468 | }; |
| 467 | 469 | ||
| 468 | /* VPLL2 for digital video outputs */ | 470 | /* VPLL2 for digital video outputs */ |