* [PATCHv2 0/1] twl4030-mfd: Add all twl4030 regulators to RegFW @ 2009-11-25 10:14 Juha Keski-Saari 2009-11-25 10:14 ` [PATCHv2 1/1] twl4030-mfd: Add all twl4030 regulators to the twl4030 mfd driver Juha Keski-Saari 0 siblings, 1 reply; 3+ messages in thread From: Juha Keski-Saari @ 2009-11-25 10:14 UTC (permalink / raw) To: lrg, broonie, dbrownell, sameo, linux-kernel Cc: peter.de-schrijver, eduardo.valentin, ext-juha.1.keski-saari This patch is a revision of an earlier patch. The previous content was split and now these changes are against sound-2.6/twl4030-mfd. These are only modifications on the twl4030 mfd driver, changes to the regulator driver were sent separately BR, Juha Keski-Saari (1): twl4030-mfd: Add all twl4030 regulators to the twl4030 mfd driver drivers/mfd/twl4030-core.c | 26 ++++++++++++++++++++++++-- include/linux/i2c/twl4030.h | 8 ++++++-- 2 files changed, 30 insertions(+), 4 deletions(-) ^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCHv2 1/1] twl4030-mfd: Add all twl4030 regulators to the twl4030 mfd driver 2009-11-25 10:14 [PATCHv2 0/1] twl4030-mfd: Add all twl4030 regulators to RegFW Juha Keski-Saari @ 2009-11-25 10:14 ` Juha Keski-Saari 2009-12-11 10:15 ` Samuel Ortiz 0 siblings, 1 reply; 3+ messages in thread From: Juha Keski-Saari @ 2009-11-25 10:14 UTC (permalink / raw) To: lrg, broonie, dbrownell, sameo, linux-kernel Cc: peter.de-schrijver, eduardo.valentin, ext-juha.1.keski-saari Add all twl4030 regulators to the twl4030 mfd driver and twl4030_platform_data Signed-off-by: Juha Keski-Saari <ext-juha.1.keski-saari@nokia.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Samuel Ortiz <sameo@linux.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 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCHv2 1/1] twl4030-mfd: Add all twl4030 regulators to the twl4030 mfd driver 2009-11-25 10:14 ` [PATCHv2 1/1] twl4030-mfd: Add all twl4030 regulators to the twl4030 mfd driver Juha Keski-Saari @ 2009-12-11 10:15 ` Samuel Ortiz 0 siblings, 0 replies; 3+ messages in thread From: Samuel Ortiz @ 2009-12-11 10:15 UTC (permalink / raw) To: Juha Keski-Saari Cc: lrg, broonie, dbrownell, linux-kernel, peter.de-schrijver, eduardo.valentin 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@nokia.com> > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> > Acked-by: Samuel Ortiz <sameo@linux.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/ ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-12-11 10:14 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-11-25 10:14 [PATCHv2 0/1] twl4030-mfd: Add all twl4030 regulators to RegFW Juha Keski-Saari 2009-11-25 10:14 ` [PATCHv2 1/1] twl4030-mfd: Add all twl4030 regulators to the twl4030 mfd driver Juha Keski-Saari 2009-12-11 10:15 ` Samuel Ortiz
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox