Hi Kalle, On Tuesday 03 May 2011 12:51:56 kalle.jokiniemi@xxxxxxxxx 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@xxxxxxxxx> > > > --- > > > > > > 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. -- Regards, Laurent Pinchart -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html