* Igor Grinberg <grinberg@xxxxxxxxxxxxxx> [111019 02:05]:
>
> Signed-off-by: Igor Grinberg <grinberg@xxxxxxxxxxxxxx>
> ---
> arch/arm/mach-omap2/board-cm-t35.c | 18 ++++++++++++++++++
> 1 files changed, 18 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
> index e15d39b..6d93db0 100644
> --- a/arch/arm/mach-omap2/board-cm-t35.c
> +++ b/arch/arm/mach-omap2/board-cm-t35.c
> @@ -343,6 +343,10 @@ static struct regulator_consumer_supply cm_t35_vdvi_supply[] = {
> REGULATOR_SUPPLY("vdvi", "omapdss"),
> };
>
> +static struct regulator_consumer_supply cm_t35_vio_supplies[] = {
> + REGULATOR_SUPPLY("vcc", "spi1.0"),
> +};
> +
> /* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
> static struct regulator_init_data cm_t35_vmmc1 = {
> .constraints = {
> @@ -373,6 +377,19 @@ static struct regulator_init_data cm_t35_vsim = {
> .consumer_supplies = cm_t35_vsim_supply,
> };
>
> +static struct regulator_init_data cm_t35_vio = {
> + .constraints = {
> + .min_uV = 1800000,
> + .max_uV = 1800000,
> + .apply_uV = true,
> + .valid_modes_mask = REGULATOR_MODE_NORMAL
> + | REGULATOR_MODE_STANDBY,
> + .valid_ops_mask = REGULATOR_CHANGE_MODE,
> + },
> + .num_consumer_supplies = ARRAY_SIZE(cm_t35_vio_supplies),
> + .consumer_supplies = cm_t35_vio_supplies,
> +};
> +
> static uint32_t cm_t35_keymap[] = {
> KEY(0, 0, KEY_A), KEY(0, 1, KEY_B), KEY(0, 2, KEY_LEFT),
> KEY(1, 0, KEY_UP), KEY(1, 1, KEY_ENTER), KEY(1, 2, KEY_DOWN),
> @@ -456,6 +473,7 @@ static struct twl4030_platform_data cm_t35_twldata = {
> .gpio = &cm_t35_gpio_data,
> .vmmc1 = &cm_t35_vmmc1,
> .vsim = &cm_t35_vsim,
> + .vio = &cm_t35_vio,
> };
>
> static void __init cm_t35_init_i2c(void)
Applying to board branch for v3.3 merge window.
Tony
--
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
