| Message ID | 1304419283-4177-3-git-send-email-kalle.jokiniemi@nokia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Kalle, Thanks for the patch. On Tuesday 03 May 2011 12:41:23 Kalle Jokiniemi wrote: > The RX-51 uses the CSIb IO complex for camera operation. The > board file is missing definition for the regulator supplying > the CSIb complex, so this is added for better power > management. > > Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@nokia.com> > --- > arch/arm/mach-omap2/board-rx51-peripherals.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c > b/arch/arm/mach-omap2/board-rx51-peripherals.c index bbcb677..2f12425 > 100644 > --- a/arch/arm/mach-omap2/board-rx51-peripherals.c > +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c > @@ -337,6 +337,10 @@ static struct omap2_hsmmc_info mmc[] __initdata = { > static struct regulator_consumer_supply rx51_vmmc1_supply = > REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); > > +static struct regulator_consumer_supply rx51_vaux2_supply[] = { > + REGULATOR_SUPPLY("vdds_csib", "omap3isp"), > +}; > + What about static struct regulator_consumer_supply rx51_vaux2_supply = REGULATOR_SUPPLY("vdds_csib", "omap3isp"); instead ? :-) It would be in line with the other vaux supply definitions. > static struct regulator_consumer_supply rx51_vaux3_supply = > REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); > > @@ -400,6 +404,8 @@ static struct regulator_init_data rx51_vaux2 = { > .valid_ops_mask = REGULATOR_CHANGE_MODE > > | REGULATOR_CHANGE_STATUS, > > }, > + .num_consumer_supplies = 1, > + .consumer_supplies = rx51_vaux2_supply, and .consumer_supplies = &rx51_vaux2_supply, here. If you're fine with that, there's no need to resubmit, I'll modify this patch and push the set through my tree (let me know if I can keep your SoB line with that change). > }; > > /* VAUX3 - adds more power to VIO_18 rail */
Hi, > -----Original Message----- > From: ext Laurent Pinchart [mailto:laurent.pinchart@ideasonboard.com] > Sent: 3. toukokuuta 2011 13:49 > To: Jokiniemi Kalle (Nokia-SD/Tampere) > Cc: maurochehab@gmail.com; tony@atomide.com; linux- > omap@vger.kernel.org; linux-media@vger.kernel.org > Subject: Re: [PATCH v3 2/2] OMAP3: RX-51: define vdds_csib regulator supply > > Hi Kalle, > > Thanks for the patch. > > On Tuesday 03 May 2011 12:41:23 Kalle Jokiniemi wrote: > > The RX-51 uses the CSIb IO complex for camera operation. The > > board file is missing definition for the regulator supplying > > the CSIb complex, so this is added for better power > > management. > > > > Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@nokia.com> > > --- > > arch/arm/mach-omap2/board-rx51-peripherals.c | 6 ++++++ > > 1 files changed, 6 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c > > b/arch/arm/mach-omap2/board-rx51-peripherals.c index bbcb677..2f12425 > > 100644 > > --- a/arch/arm/mach-omap2/board-rx51-peripherals.c > > +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c > > @@ -337,6 +337,10 @@ static struct omap2_hsmmc_info mmc[] __initdata = > { > > static struct regulator_consumer_supply rx51_vmmc1_supply = > > REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); > > > > +static struct regulator_consumer_supply rx51_vaux2_supply[] = { > > + REGULATOR_SUPPLY("vdds_csib", "omap3isp"), > > +}; > > + > > What about > > static struct regulator_consumer_supply rx51_vaux2_supply = > REGULATOR_SUPPLY("vdds_csib", "omap3isp"); > > instead ? :-) It would be in line with the other vaux supply definitions. > > > static struct regulator_consumer_supply rx51_vaux3_supply = > > REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); > > > > @@ -400,6 +404,8 @@ static struct regulator_init_data rx51_vaux2 = { > > .valid_ops_mask = REGULATOR_CHANGE_MODE > > > > | REGULATOR_CHANGE_STATUS, > > > > }, > > + .num_consumer_supplies = 1, > > + .consumer_supplies = rx51_vaux2_supply, > > and > > .consumer_supplies = &rx51_vaux2_supply, > > here. > > If you're fine with that, there's no need to resubmit, I'll modify this patch > and push the set through my tree (let me know if I can keep your SoB line with > that change). Perfectly fine with me, you can keep the SoB line. Thanks, Kalle > > > }; > > > > /* VAUX3 - adds more power to VIO_18 rail */ > > -- > Regards, > > Laurent Pinchart -- 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 Kalle, On Tuesday 03 May 2011 12:51:56 kalle.jokiniemi@nokia.com wrote: > On 3. toukokuuta 2011 13:49 Laurent Pinchart wrote: > > On Tuesday 03 May 2011 12:41:23 Kalle Jokiniemi wrote: > > > The RX-51 uses the CSIb IO complex for camera operation. The > > > board file is missing definition for the regulator supplying > > > the CSIb complex, so this is added for better power > > > management. > > > > > > Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@nokia.com> > > > --- > > > > > > arch/arm/mach-omap2/board-rx51-peripherals.c | 6 ++++++ > > > 1 files changed, 6 insertions(+), 0 deletions(-) > > > > > > diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c > > > b/arch/arm/mach-omap2/board-rx51-peripherals.c index bbcb677..2f12425 > > > 100644 > > > --- a/arch/arm/mach-omap2/board-rx51-peripherals.c > > > +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c > > > @@ -337,6 +337,10 @@ static struct omap2_hsmmc_info mmc[] __initdata = > > > > { > > > > > static struct regulator_consumer_supply rx51_vmmc1_supply = > > > > > > REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); > > > > > > +static struct regulator_consumer_supply rx51_vaux2_supply[] = { > > > + REGULATOR_SUPPLY("vdds_csib", "omap3isp"), > > > +}; > > > + > > > > What about > > > > static struct regulator_consumer_supply rx51_vaux2_supply = > > > > REGULATOR_SUPPLY("vdds_csib", "omap3isp"); > > > > instead ? :-) It would be in line with the other vaux supply > > definitions. > > > > > static struct regulator_consumer_supply rx51_vaux3_supply = > > > > > > REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); > > > > > > @@ -400,6 +404,8 @@ static struct regulator_init_data rx51_vaux2 = { > > > > > > .valid_ops_mask = REGULATOR_CHANGE_MODE > > > > > > | REGULATOR_CHANGE_STATUS, > > > > > > }, > > > > > > + .num_consumer_supplies = 1, > > > + .consumer_supplies = rx51_vaux2_supply, > > > > and > > > > .consumer_supplies = &rx51_vaux2_supply, > > > > here. > > > > If you're fine with that, there's no need to resubmit, I'll modify this > > patch and push the set through my tree (let me know if I can keep your > > SoB line with that change). > > Perfectly fine with me, you can keep the SoB line. I've picked the patches up. I'll submit them for 2.6.40.
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index bbcb677..2f12425 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -337,6 +337,10 @@ static struct omap2_hsmmc_info mmc[] __initdata = { static struct regulator_consumer_supply rx51_vmmc1_supply = REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); +static struct regulator_consumer_supply rx51_vaux2_supply[] = { + REGULATOR_SUPPLY("vdds_csib", "omap3isp"), +}; + static struct regulator_consumer_supply rx51_vaux3_supply = REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1"); @@ -400,6 +404,8 @@ static struct regulator_init_data rx51_vaux2 = { .valid_ops_mask = REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS, }, + .num_consumer_supplies = 1, + .consumer_supplies = rx51_vaux2_supply, }; /* VAUX3 - adds more power to VIO_18 rail */
The RX-51 uses the CSIb IO complex for camera operation. The board file is missing definition for the regulator supplying the CSIb complex, so this is added for better power management. Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@nokia.com> --- arch/arm/mach-omap2/board-rx51-peripherals.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-)