| Message ID | 200902261602.58832.david-b@pacbell.net (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Tony Lindgren |
| Headers | show |
On Thu, 2009-02-26 at 16:02 -0800, David Brownell wrote: > On Thursday 26 February 2009, Liam Girdwood wrote: > > > > > > Note that the twl4030 regulator patch referred to will need a > > > minor patch to work with the -next tree, because of interface > > > change in the regulator framework. > > > > > > drivers/regulator/twl4030-regulator.c | 62 +++++++++++--------------------- > > > 1 file changed, 23 insertions(+), 39 deletions(-) > > > > Applied. > > .... and here's that "minor patch". > > ====== CUT HERE > From: David Brownell <dbrownell@users.sourceforge.net> > > Catch up the twl4030 regulator driver to the regulator > interface change adding another parameter. Also, fix > some comments, and take this opportunity to shrink the > associated per-regulator memory usage by a word. > > Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> > --- > drivers/regulator/twl4030-regulator.c | 17 +++++++++-------- > 1 file changed, 9 insertions(+), 8 deletions(-) Sorry, this didn't apply. It looks like I'm missing an earlier patch(s) here. Could you regenerate this and your core patch against latest for-next. Thanks Liam -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Friday 27 February 2009, Liam Girdwood wrote: > On Thu, 2009-02-26 at 16:02 -0800, David Brownell wrote: > > On Thursday 26 February 2009, Liam Girdwood wrote: > > > > > > > > Note that the twl4030 regulator patch referred to will need a > > > > minor patch to work with the -next tree, because of interface > > > > change in the regulator framework. > > > > > > Applied. > > > > .... and here's that "minor patch". > > > > ... > > Sorry, this didn't apply. It looks like I'm missing an earlier patch(s) > here. Could you regenerate this and your core patch against latest > for-next. The regulator -next tree seems to be missing a bunch of stuff... I generated this patch against a "twl4030-regulator.c" which I extracted *from that tree* yesterday. But today it's different. In this case, the current code doesn't have the $SUBJECT patch, which at that time you had applied. But it does have a small snippet from that "minor patch"... Color me confused. Are you asking for a "v3" of $SUBJECT, or is the "v2" going to re-appear? And when will that -next tree acquire the rest of http://marc.info/?l=linux-kernel&m=123567791402469&w=2 Having only the driver.h part of that patch breaks things (your 0ae0e667c8a2bacfe066b90f8f2ee3b4a83a120d). - Dave -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2009-02-27 at 12:39 -0800, David Brownell wrote: > On Friday 27 February 2009, Liam Girdwood wrote: > > Sorry, this didn't apply. It looks like I'm missing an earlier patch(s) > > here. Could you regenerate this and your core patch against latest > > for-next. > > The regulator -next tree seems to be missing a bunch of stuff... > I generated this patch against a "twl4030-regulator.c" which I > extracted *from that tree* yesterday. But today it's different. > > In this case, the current code doesn't have the $SUBJECT patch, > which at that time you had applied. But it does have a small > snippet from that "minor patch"... > > > Color me confused. Are you asking for a "v3" of $SUBJECT, or > is the "v2" going to re-appear? Applied the "v2". > And when will that -next tree > acquire the rest of > > http://marc.info/?l=linux-kernel&m=123567791402469&w=2 > Applied and re-based this one into original patch. Thanks Liam -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
====== CUT HERE From: David Brownell <dbrownell@users.sourceforge.net> Catch up the twl4030 regulator driver to the regulator interface change adding another parameter. Also, fix some comments, and take this opportunity to shrink the associated per-regulator memory usage by a word. Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> --- drivers/regulator/twl4030-regulator.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) --- a/drivers/regulator/twl4030-regulator.c +++ b/drivers/regulator/twl4030-regulator.c @@ -36,13 +36,13 @@ struct twlreg_info { /* twl4030 resource ID, for resource control state machine */ u8 id; + /* FIXED_LDO voltage */ + u8 deciV; + /* voltage in mV = table[VSEL]; table_len must be a power-of-two */ u8 table_len; const u16 *table; - /* chip constraints on regulator behavior */ - u16 min_mV; - /* used by regulator core */ struct regulator_desc desc; }; @@ -329,14 +329,14 @@ static int twl4030fixed_list_voltage(str { struct twlreg_info *info = rdev_get_drvdata(rdev); - return info->min_mV * 1000; + return info->deciV * 100 * 1000; } static int twl4030fixed_get_voltage(struct regulator_dev *rdev) { struct twlreg_info *info = rdev_get_drvdata(rdev); - return info->min_mV * 1000; + return info->deciV * 100 * 1000; } static struct regulator_ops twl4030fixed_ops = { @@ -373,7 +373,7 @@ static struct regulator_ops twl4030fixed #define TWL_FIXED_LDO(label, offset, mVolts, num) { \ .base = offset, \ .id = num, \ - .min_mV = mVolts, \ + .deciV = mVolts / 100 , \ .desc = { \ .name = #label, \ .id = TWL4030_REG_##label, \ @@ -385,7 +385,7 @@ static struct regulator_ops twl4030fixed } /* - * We list regulators here if systems need some level of + * We expose regulators here if systems need some level of * software control over them after boot. */ static struct twlreg_info twl4030_regs[] = { @@ -439,6 +439,7 @@ static int twl4030reg_probe(struct platf /* Constrain board-specific capabilities according to what * this driver and the chip itself can actually do. + * (Regulator core now does this for voltage constraints.) */ c = &initdata->constraints; c->valid_modes_mask &= REGULATOR_MODE_NORMAL | REGULATOR_MODE_STANDBY; @@ -446,7 +447,7 @@ static int twl4030reg_probe(struct platf | REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS; - rdev = regulator_register(&info->desc, &pdev->dev, info); + rdev = regulator_register(&info->desc, &pdev->dev, initdata, info); if (IS_ERR(rdev)) { dev_err(&pdev->dev, "can't register %s, %ld\n", info->desc.name, PTR_ERR(rdev));