| Message ID | 1307342762-25363-2-git-send-email-green@linuxhacker.ru (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Delegated to: | Tony Lindgren |
| Headers | show |
On 6/6/2011 12:16 PM, green@linuxhacker.ru wrote: > From: Oleg Drokin<green@linuxhacker.ru> > > 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> > Signed-off-by: Oleg Drokin<green@linuxhacker.ru> > --- Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Mon, Jun 06, 2011 at 02:46:01AM -0400, green@linuxhacker.ru wrote: > From: Oleg Drokin <green@linuxhacker.ru> > > 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> > Signed-off-by: Oleg Drokin <green@linuxhacker.ru> > --- > arch/arm/mach-omap2/board-4430sdp.c | 16 +++++----------- > arch/arm/mach-omap2/board-cm-t35.c | 10 ++++------ > arch/arm/mach-omap2/board-ldp.c | 5 ++--- > arch/arm/mach-omap2/board-omap3beagle.c | 10 ++++------ > arch/arm/mach-omap2/board-omap3evm.c | 10 ++++------ > arch/arm/mach-omap2/board-omap3logic.c | 5 ++--- > arch/arm/mach-omap2/board-omap3stalker.c | 10 ++++------ > arch/arm/mach-omap2/board-omap3touchbook.c | 10 ++++------ > arch/arm/mach-omap2/board-omap4panda.c | 16 +++++----------- > arch/arm/mach-omap2/board-overo.c | 5 ++--- > arch/arm/mach-omap2/board-zoom-peripherals.c | 21 ++++++++------------- > 11 files changed, 44 insertions(+), 74 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c > index 63de2d3..914885a 100644 > --- a/arch/arm/mach-omap2/board-4430sdp.c > +++ b/arch/arm/mach-omap2/board-4430sdp.c > @@ -332,17 +332,11 @@ static struct omap2_hsmmc_info mmc[] = { > {} /* Terminator */ > }; > > -static struct regulator_consumer_supply sdp4430_vaux_supply[] = { > - { > - .supply = "vmmc", > - .dev_name = "omap_hsmmc.1", > - }, > -}; > +static struct regulator_consumer_supply sdp4430_vaux_supply = > + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); this should be an array, as it was before. > + > static struct regulator_consumer_supply sdp4430_vmmc_supply[] = { > - { > - .supply = "vmmc", > - .dev_name = "omap_hsmmc.0", > - }, > + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), > }; > > static int omap4_twl6030_hsmmc_late_init(struct device *dev) > @@ -400,7 +394,7 @@ static struct regulator_init_data sdp4430_vaux1 = { > | REGULATOR_CHANGE_STATUS, > }, > .num_consumer_supplies = 1, and this should use ARRAY_SIZE(), > - .consumer_supplies = sdp4430_vaux_supply, > + .consumer_supplies = &sdp4430_vaux_supply, > }; > > static struct regulator_init_data sdp4430_vaux2 = { > diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c > index 77456de..33855e4 100644 > --- a/arch/arm/mach-omap2/board-cm-t35.c > +++ b/arch/arm/mach-omap2/board-cm-t35.c > @@ -337,13 +337,11 @@ static void __init cm_t35_init_display(void) > } > } > > -static struct regulator_consumer_supply cm_t35_vmmc1_supply = { > - .supply = "vmmc", > -}; > +static struct regulator_consumer_supply cm_t35_vmmc1_supply = > + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); this should also be array. It should read as: static struct regulator_consumer_supply cm_t35_vmmc1_supply[] = REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0", }; ditto to all others.
Hello! On Jun 6, 2011, at 5:21 AM, Felipe Balbi wrote: >> -static struct regulator_consumer_supply sdp4430_vaux_supply[] = { >> - { >> - .supply = "vmmc", >> - .dev_name = "omap_hsmmc.1", >> - }, >> -}; >> +static struct regulator_consumer_supply sdp4430_vaux_supply = >> + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); > this should be an array, as it was before. Only one is defined right now. Whoever needs a second element can convert it to array, I think? What;s the importance of having it as an array right now? >> --- a/arch/arm/mach-omap2/board-cm-t35.c >> +++ b/arch/arm/mach-omap2/board-cm-t35.c >> @@ -337,13 +337,11 @@ static void __init cm_t35_init_display(void) >> } >> } >> >> -static struct regulator_consumer_supply cm_t35_vmmc1_supply = { >> - .supply = "vmmc", >> -}; >> +static struct regulator_consumer_supply cm_t35_vmmc1_supply = >> + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); > > this should also be array. It should read as: > > static struct regulator_consumer_supply cm_t35_vmmc1_supply[] = > REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0", > }; Why this one should be an array? There is only one vmmc supply in functionality-reduced implementation TWL used on this board. (in fact this particular board files defines more supplies then there are in the TWL and I planned to do another patch that would kill all the defined but not really existing supplies next like vpll2 and such). Bye, Oleg-- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi, On Mon, Jun 06, 2011 at 11:45:29AM -0400, Oleg Drokin wrote: > >> -static struct regulator_consumer_supply sdp4430_vaux_supply[] = { > >> - { > >> - .supply = "vmmc", > >> - .dev_name = "omap_hsmmc.1", > >> - }, > >> -}; > >> +static struct regulator_consumer_supply sdp4430_vaux_supply = > >> + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); > > this should be an array, as it was before. > > Only one is defined right now. > Whoever needs a second element can convert it to array, I think? > What;s the importance of having it as an array right now? because later patches will be easier to review. Look below: When I have this: static struct regulator_consumer_supply sdp4430_vmmc_supply[] = { REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), }; static struct regulator_init_data sdp4430_vmmc = { .constraints = { .min_uV = 1200000, .max_uV = 3000000, .apply_uV = true, .valid_modes_mask = REGULATOR_MODE_NORMAL | REGULATOR_MODE_STANDBY, .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, .num_consumer_supplies = ARRAY_SIZE(sdp4430_vmmc_supply), .consumer_supplies = sdp4430_vmmc_supply, }; and I want to add a new REGULATOR_SUPPLY() the diff is simple: @@ -1,5 +1,6 @@ static struct regulator_consumer_supply sdp4430_vmmc_supply[] = { REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), + REGULATOR_SUPPLY("vmmc2", "omap_hsmmc.0"), }; static struct regulator_init_data sdp4430_vmmc = { now when I have this: static struct regulator_consumer_supply sdp4430_vmmc_supply = REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); static struct regulator_init_data sdp4430_vmmc = { .constraints = { .min_uV = 1200000, .max_uV = 3000000, .apply_uV = true, .valid_modes_mask = REGULATOR_MODE_NORMAL | REGULATOR_MODE_STANDBY, .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE | REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, .num_consumer_supplies = 1, .consumer_supplies = &sdp4430_vmmc_supply, }; and I want to add the same supply, the diff is less obvious: @@ -1,5 +1,7 @@ -static struct regulator_consumer_supply sdp4430_vmmc_supply = - REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); +static struct regulator_consumer_supply sdp4430_vmmc_supply[] = { + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), + REGULATOR_SUPPLY("vmmc2", "omap_hsmmc.0"), +}; static struct regulator_init_data sdp4430_vmmc = { .constraints = { @@ -12,6 +14,6 @@ static struct regulator_init_data sdp443 | REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, - .num_consumer_supplies = 1, - .consumer_supplies = &sdp4430_vmmc_supply, + .num_consumer_supplies = ARRAY_SIZE(sdp4430_vmmc_supply), + .consumer_supplies = sdp4430_vmmc_supply, }; can you see now ?
Hello! On Jun 6, 2011, at 1:13 PM, Felipe Balbi wrote: > On Mon, Jun 06, 2011 at 11:45:29AM -0400, Oleg Drokin wrote: >>>> -static struct regulator_consumer_supply sdp4430_vaux_supply[] = { >>>> - { >>>> - .supply = "vmmc", >>>> - .dev_name = "omap_hsmmc.1", >>>> - }, >>>> -}; >>>> +static struct regulator_consumer_supply sdp4430_vaux_supply = >>>> + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); >>> this should be an array, as it was before. >> >> Only one is defined right now. >> Whoever needs a second element can convert it to array, I think? >> What;s the importance of having it as an array right now? > because later patches will be easier to review. Look below: ... > can you see now ? Ok, I get the idea. Do you think it would be best to convert every supply definition to an array then just in case? I wonder what are the chances of additional regulators to appear at all in many of these. What about supplies that are not going to have additional elements (like that cm-t35 board, because there simply are no more regulators in the twl)? Bye, Oleg-- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Jun 06, 2011 at 01:18:41PM -0400, Oleg Drokin wrote: > Hello! > > On Jun 6, 2011, at 1:13 PM, Felipe Balbi wrote: > > On Mon, Jun 06, 2011 at 11:45:29AM -0400, Oleg Drokin wrote: > >>>> -static struct regulator_consumer_supply sdp4430_vaux_supply[] = { > >>>> - { > >>>> - .supply = "vmmc", > >>>> - .dev_name = "omap_hsmmc.1", > >>>> - }, > >>>> -}; > >>>> +static struct regulator_consumer_supply sdp4430_vaux_supply = > >>>> + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); > >>> this should be an array, as it was before. > >> > >> Only one is defined right now. > >> Whoever needs a second element can convert it to array, I think? > >> What;s the importance of having it as an array right now? > > because later patches will be easier to review. Look below: > ... > > can you see now ? > > Ok, I get the idea. Do you think it would be best to convert every supply > definition to an array then just in case? I think that while you're doing this big conversion, why not ? > I wonder what are the chances of additional regulators to appear at all > in many of these. > What about supplies that are not going to have additional elements > (like that cm-t35 board, because there simply are no more regulators in the twl)? Still, It's the same thing I was discussing with Alan Stern on another thread, it comes down to uniformity and you never know when someone might decide to hook up and always on supply to any node :-p
Hello! On Jun 6, 2011, at 1:28 PM, Felipe Balbi wrote: >> Ok, I get the idea. Do you think it would be best to convert every supply >> definition to an array then just in case? > I think that while you're doing this big conversion, why not ? Well, ok then. I'll redo this patch. Bye, Oleg -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 63de2d3..914885a 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@ -332,17 +332,11 @@ static struct omap2_hsmmc_info mmc[] = { {} /* Terminator */ }; -static struct regulator_consumer_supply sdp4430_vaux_supply[] = { - { - .supply = "vmmc", - .dev_name = "omap_hsmmc.1", - }, -}; +static struct regulator_consumer_supply sdp4430_vaux_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); + static struct regulator_consumer_supply sdp4430_vmmc_supply[] = { - { - .supply = "vmmc", - .dev_name = "omap_hsmmc.0", - }, + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), }; static int omap4_twl6030_hsmmc_late_init(struct device *dev) @@ -400,7 +394,7 @@ static struct regulator_init_data sdp4430_vaux1 = { | REGULATOR_CHANGE_STATUS, }, .num_consumer_supplies = 1, - .consumer_supplies = sdp4430_vaux_supply, + .consumer_supplies = &sdp4430_vaux_supply, }; static struct regulator_init_data sdp4430_vaux2 = { diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c index 77456de..33855e4 100644 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c @@ -337,13 +337,11 @@ static void __init cm_t35_init_display(void) } } -static struct regulator_consumer_supply cm_t35_vmmc1_supply = { - .supply = "vmmc", -}; +static struct regulator_consumer_supply cm_t35_vmmc1_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); -static struct regulator_consumer_supply cm_t35_vsim_supply = { - .supply = "vmmc_aux", -}; +static struct regulator_consumer_supply cm_t35_vsim_supply = + REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"); static struct regulator_consumer_supply cm_t35_vdac_supply = REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"); diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c index f7d6038..f9b48fa 100644 --- a/arch/arm/mach-omap2/board-ldp.c +++ b/arch/arm/mach-omap2/board-ldp.c @@ -213,9 +213,8 @@ static struct twl4030_madc_platform_data ldp_madc_data = { .irq_line = 1, }; -static struct regulator_consumer_supply ldp_vmmc1_supply = { - .supply = "vmmc", -}; +static struct regulator_consumer_supply ldp_vmmc1_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ static struct regulator_init_data ldp_vmmc1 = { diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c index 7f21d24..f72279f 100644 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@ -239,13 +239,11 @@ static struct omap2_hsmmc_info mmc[] = { {} /* Terminator */ }; -static struct regulator_consumer_supply beagle_vmmc1_supply = { - .supply = "vmmc", -}; +static struct regulator_consumer_supply beagle_vmmc1_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); -static struct regulator_consumer_supply beagle_vsim_supply = { - .supply = "vmmc_aux", -}; +static struct regulator_consumer_supply beagle_vsim_supply = + REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"); static struct gpio_led gpio_leds[]; diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index b4d4346..67d8a79 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -273,13 +273,11 @@ static struct omap_dss_board_info omap3_evm_dss_data = { .default_device = &omap3_evm_lcd_device, }; -static struct regulator_consumer_supply omap3evm_vmmc1_supply = { - .supply = "vmmc", -}; +static struct regulator_consumer_supply omap3evm_vmmc1_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); -static struct regulator_consumer_supply omap3evm_vsim_supply = { - .supply = "vmmc_aux", -}; +static struct regulator_consumer_supply omap3evm_vsim_supply = + REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"); /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ static struct regulator_init_data omap3evm_vmmc1 = { diff --git a/arch/arm/mach-omap2/board-omap3logic.c b/arch/arm/mach-omap2/board-omap3logic.c index 60d9be4..4a37bf76f 100644 --- a/arch/arm/mach-omap2/board-omap3logic.c +++ b/arch/arm/mach-omap2/board-omap3logic.c @@ -55,9 +55,8 @@ #define OMAP3_TORPEDO_MMC_GPIO_CD 127 #define OMAP3_TORPEDO_SMSC911X_GPIO_IRQ 129 -static struct regulator_consumer_supply omap3logic_vmmc1_supply = { - .supply = "vmmc", -}; +static struct regulator_consumer_supply omap3logic_vmmc1_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ static struct regulator_init_data omap3logic_vmmc1 = { diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c index 0c108a2..3bf67ab 100644 --- a/arch/arm/mach-omap2/board-omap3stalker.c +++ b/arch/arm/mach-omap2/board-omap3stalker.c @@ -206,13 +206,11 @@ static struct omap_dss_board_info omap3_stalker_dss_data = { .default_device = &omap3_stalker_dvi_device, }; -static struct regulator_consumer_supply omap3stalker_vmmc1_supply = { - .supply = "vmmc", -}; +static struct regulator_consumer_supply omap3stalker_vmmc1_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); -static struct regulator_consumer_supply omap3stalker_vsim_supply = { - .supply = "vmmc_aux", -}; +static struct regulator_consumer_supply omap3stalker_vsim_supply = + REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"); /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */ static struct regulator_init_data omap3stalker_vmmc1 = { diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c index 5f649fa..27840e8 100644 --- a/arch/arm/mach-omap2/board-omap3touchbook.c +++ b/arch/arm/mach-omap2/board-omap3touchbook.c @@ -114,13 +114,11 @@ static struct omap_lcd_config omap3_touchbook_lcd_config __initdata = { .ctrl_name = "internal", }; -static struct regulator_consumer_supply touchbook_vmmc1_supply = { - .supply = "vmmc", -}; +static struct regulator_consumer_supply touchbook_vmmc1_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); -static struct regulator_consumer_supply touchbook_vsim_supply = { - .supply = "vmmc_aux", -}; +static struct regulator_consumer_supply touchbook_vsim_supply = + REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"); static struct gpio_led gpio_leds[]; diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 0cfe200..37823e4 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -182,17 +182,11 @@ static struct omap2_hsmmc_info mmc[] = { {} /* Terminator */ }; -static struct regulator_consumer_supply omap4_panda_vmmc_supply[] = { - { - .supply = "vmmc", - .dev_name = "omap_hsmmc.0", - }, -}; +static struct regulator_consumer_supply omap4_panda_vmmc_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); -static struct regulator_consumer_supply omap4_panda_vmmc5_supply = { - .supply = "vmmc", - .dev_name = "omap_hsmmc.4", -}; +static struct regulator_consumer_supply omap4_panda_vmmc5_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.4"); static struct regulator_init_data panda_vmmc5 = { .constraints = { @@ -313,7 +307,7 @@ static struct regulator_init_data omap4_panda_vmmc = { | REGULATOR_CHANGE_STATUS, }, .num_consumer_supplies = 1, - .consumer_supplies = omap4_panda_vmmc_supply, + .consumer_supplies = &omap4_panda_vmmc_supply, }; static struct regulator_init_data omap4_panda_vpp = { diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c index 175e1ab..e6c6153 100644 --- a/arch/arm/mach-omap2/board-overo.c +++ b/arch/arm/mach-omap2/board-overo.c @@ -319,9 +319,8 @@ static struct omap2_hsmmc_info mmc[] = { {} /* Terminator */ }; -static struct regulator_consumer_supply overo_vmmc1_supply = { - .supply = "vmmc", -}; +static struct regulator_consumer_supply overo_vmmc1_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) #include <linux/leds.h> diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c index 118c6f5..db77305 100644 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -105,22 +105,17 @@ static struct twl4030_keypad_data zoom_kp_twl4030_data = { .rep = 1, }; -static struct regulator_consumer_supply zoom_vmmc1_supply = { - .supply = "vmmc", -}; +static struct regulator_consumer_supply zoom_vmmc1_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); -static struct regulator_consumer_supply zoom_vsim_supply = { - .supply = "vmmc_aux", -}; +static struct regulator_consumer_supply zoom_vsim_supply = + REGULATOR_SUPPLY("vmmc_aux", "omap_hsmmc.0"); -static struct regulator_consumer_supply zoom_vmmc2_supply = { - .supply = "vmmc", -}; +static struct regulator_consumer_supply zoom_vmmc2_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); -static struct regulator_consumer_supply zoom_vmmc3_supply = { - .supply = "vmmc", - .dev_name = "omap_hsmmc.2", -}; +static struct regulator_consumer_supply zoom_vmmc3_supply = + REGULATOR_SUPPLY("vmmc", "omap_hsmmc.2"); /* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */ static struct regulator_init_data zoom_vmmc1 = {