[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20091211101555.GA5863@sortiz.org>
Date: Fri, 11 Dec 2009 11:15:56 +0100
From: Samuel Ortiz <sameo@...ux.intel.com>
To: Juha Keski-Saari <ext-juha.1.keski-saari@...ia.com>
Cc: lrg@...mlogic.co.uk, broonie@...nsource.wolfsonmicro.com,
dbrownell@...rs.sourceforge.net, linux-kernel@...r.kernel.org,
peter.de-schrijver@...ia.com, eduardo.valentin@...ia.com
Subject: Re: [PATCHv2 1/1] twl4030-mfd: Add all twl4030 regulators to the
twl4030 mfd driver
Hi Juha,
On Wed, Nov 25, 2009 at 12:14:02PM +0200, Juha Keski-Saari wrote:
> Add all twl4030 regulators to the twl4030 mfd driver and
> twl4030_platform_data
Patch applied, thanks.
Cheers,
Samuel.
> Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@...ia.com>
> Acked-by: Mark Brown <broonie@...nsource.wolfsonmicro.com>
> Acked-by: Samuel Ortiz <sameo@...ux.intel.com>
> ---
> drivers/mfd/twl4030-core.c | 26 ++++++++++++++++++++++++--
> include/linux/i2c/twl4030.h | 8 ++++++--
> 2 files changed, 30 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c
> index 0ee81e4..2d659e6 100644
> --- a/drivers/mfd/twl4030-core.c
> +++ b/drivers/mfd/twl4030-core.c
> @@ -572,11 +572,21 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
> }
>
> if (twl_has_regulator()) {
> - /*
> child = add_regulator(TWL4030_REG_VPLL1, pdata->vpll1);
> if (IS_ERR(child))
> return PTR_ERR(child);
> - */
> +
> + child = add_regulator(TWL4030_REG_VIO, pdata->vio);
> + if (IS_ERR(child))
> + return PTR_ERR(child);
> +
> + child = add_regulator(TWL4030_REG_VDD1, pdata->vdd1);
> + if (IS_ERR(child))
> + return PTR_ERR(child);
> +
> + child = add_regulator(TWL4030_REG_VDD2, pdata->vdd2);
> + if (IS_ERR(child))
> + return PTR_ERR(child);
>
> child = add_regulator(TWL4030_REG_VMMC1, pdata->vmmc1);
> if (IS_ERR(child))
> @@ -592,6 +602,18 @@ add_children(struct twl4030_platform_data *pdata, unsigned long features)
> pdata->vaux2);
> if (IS_ERR(child))
> return PTR_ERR(child);
> +
> + child = add_regulator(TWL4030_REG_VINTANA1, pdata->vintana1);
> + if (IS_ERR(child))
> + return PTR_ERR(child);
> +
> + child = add_regulator(TWL4030_REG_VINTANA2, pdata->vintana2);
> + if (IS_ERR(child))
> + return PTR_ERR(child);
> +
> + child = add_regulator(TWL4030_REG_VINTDIG, pdata->vintdig);
> + if (IS_ERR(child))
> + return PTR_ERR(child);
> }
>
> if (twl_has_regulator() && usb_transceiver) {
> diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h
> index c188961..bf143d8 100644
> --- a/include/linux/i2c/twl4030.h
> +++ b/include/linux/i2c/twl4030.h
> @@ -440,8 +440,12 @@ struct twl4030_platform_data {
> struct regulator_init_data *vaux2;
> struct regulator_init_data *vaux3;
> struct regulator_init_data *vaux4;
> -
> - /* REVISIT more to come ... _nothing_ should be hard-wired */
> + struct regulator_init_data *vio;
> + struct regulator_init_data *vdd1;
> + struct regulator_init_data *vdd2;
> + struct regulator_init_data *vintana1;
> + struct regulator_init_data *vintana2;
> + struct regulator_init_data *vintdig;
> };
>
> /*----------------------------------------------------------------------*/
> --
> 1.6.3.3
>
--
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists