* Kalle Jokiniemi <kalle.jokiniemi@xxxxxxxxx> [110429 00:09]:
> 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>
This looks safe to merge along with the other patch:
Acked-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
> arch/arm/mach-omap2/board-rx51-peripherals.c | 9 +++++++++
> 1 files changed, 9 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..1324ba3 100644
> --- a/arch/arm/mach-omap2/board-rx51-peripherals.c
> +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
> @@ -337,6 +337,13 @@ 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_supplies[] = {
> + REGULATOR_SUPPLY("vdds_csib", "omap3isp"),
> + {
> + .supply = "vaux2",
> + },
> +};
> +
> static struct regulator_consumer_supply rx51_vaux3_supply =
> REGULATOR_SUPPLY("vmmc", "omap_hsmmc.1");
>
> @@ -400,6 +407,8 @@ static struct regulator_init_data rx51_vaux2 = {
> .valid_ops_mask = REGULATOR_CHANGE_MODE
> | REGULATOR_CHANGE_STATUS,
> },
> + .num_consumer_supplies = ARRAY_SIZE(rx51_vaux2_supplies),
> + .consumer_supplies = rx51_vaux2_supplies,
> };
>
> /* VAUX3 - adds more power to VIO_18 rail */
> --
> 1.7.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
