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-omap3beagle.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-omap3beagle.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3beagle.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 7f21d24bd437..4cf7c19ea0ef 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c | |||
@@ -210,8 +210,9 @@ static struct omap_dss_board_info beagle_dss_data = { | |||
210 | .default_device = &beagle_dvi_device, | 210 | .default_device = &beagle_dvi_device, |
211 | }; | 211 | }; |
212 | 212 | ||
213 | static struct regulator_consumer_supply beagle_vdac_supply = | 213 | static struct regulator_consumer_supply beagle_vdac_supply[] = { |
214 | REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"); | 214 | REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"), |
215 | }; | ||
215 | 216 | ||
216 | static struct regulator_consumer_supply beagle_vdvi_supplies[] = { | 217 | static struct regulator_consumer_supply beagle_vdvi_supplies[] = { |
217 | REGULATOR_SUPPLY("vdds_dsi", "omapdss"), | 218 | REGULATOR_SUPPLY("vdds_dsi", "omapdss"), |
@@ -239,12 +240,12 @@ static struct omap2_hsmmc_info mmc[] = { | |||
239 | {} /* Terminator */ | 240 | {} /* Terminator */ |
240 | }; | 241 | }; |
241 | 242 | ||
242 | static struct regulator_consumer_supply beagle_vmmc1_supply = { | 243 | static struct regulator_consumer_supply beagle_vmmc1_supply[] = { |
243 | .supply = "vmmc", | 244 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), |
244 | }; | 245 | }; |
245 | 246 | ||
246 | static struct regulator_consumer_supply beagle_vsim_supply = { | 247 | static struct regulator_consumer_supply beagle_vsim_supply[] = { |
247 | .supply = "vmmc_aux", | 248 | REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"), |
248 | }; | 249 | }; |
249 | 250 | ||
250 | static struct gpio_led gpio_leds[]; | 251 | static struct gpio_led gpio_leds[]; |
@@ -336,8 +337,8 @@ static struct regulator_init_data beagle_vmmc1 = { | |||
336 | | REGULATOR_CHANGE_MODE | 337 | | REGULATOR_CHANGE_MODE |
337 | | REGULATOR_CHANGE_STATUS, | 338 | | REGULATOR_CHANGE_STATUS, |
338 | }, | 339 | }, |
339 | .num_consumer_supplies = 1, | 340 | .num_consumer_supplies = ARRAY_SIZE(beagle_vmmc1_supply), |
340 | .consumer_supplies = &beagle_vmmc1_supply, | 341 | .consumer_supplies = beagle_vmmc1_supply, |
341 | }; | 342 | }; |
342 | 343 | ||
343 | /* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */ | 344 | /* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */ |
@@ -351,8 +352,8 @@ static struct regulator_init_data beagle_vsim = { | |||
351 | | REGULATOR_CHANGE_MODE | 352 | | REGULATOR_CHANGE_MODE |
352 | | REGULATOR_CHANGE_STATUS, | 353 | | REGULATOR_CHANGE_STATUS, |
353 | }, | 354 | }, |
354 | .num_consumer_supplies = 1, | 355 | .num_consumer_supplies = ARRAY_SIZE(beagle_vsim_supply), |
355 | .consumer_supplies = &beagle_vsim_supply, | 356 | .consumer_supplies = beagle_vsim_supply, |
356 | }; | 357 | }; |
357 | 358 | ||
358 | /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ | 359 | /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ |
@@ -365,8 +366,8 @@ static struct regulator_init_data beagle_vdac = { | |||
365 | .valid_ops_mask = REGULATOR_CHANGE_MODE | 366 | .valid_ops_mask = REGULATOR_CHANGE_MODE |
366 | | REGULATOR_CHANGE_STATUS, | 367 | | REGULATOR_CHANGE_STATUS, |
367 | }, | 368 | }, |
368 | .num_consumer_supplies = 1, | 369 | .num_consumer_supplies = ARRAY_SIZE(beagle_vdac_supply), |
369 | .consumer_supplies = &beagle_vdac_supply, | 370 | .consumer_supplies = beagle_vdac_supply, |
370 | }; | 371 | }; |
371 | 372 | ||
372 | /* VPLL2 for digital video outputs */ | 373 | /* VPLL2 for digital video outputs */ |