| Message ID | 1308066307-415-3-git-send-email-green@linuxhacker.ru (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | Tony Lindgren |
| Headers | show |
Samuel, * green@linuxhacker.ru <green@linuxhacker.ru> [110614 08:42]: > From: Oleg Drokin <green@linuxhacker.ru> > > Very similar to TPS65920 > List of differences: http://www.ti.com/litv/pdf/swcu066b > > CC: sameo@linux.intel.com > Signed-off-by: Oleg Drokin <green@linuxhacker.ru> Looks like this one can be merged independently of the rest of the Nook patches via your mfd tree. Care to queue this? Regards, Tony > --- > drivers/mfd/twl-core.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > index b8f2a4e..756f3eb 100644 > --- a/drivers/mfd/twl-core.c > +++ b/drivers/mfd/twl-core.c > @@ -1284,6 +1284,8 @@ static const struct i2c_device_id twl_ids[] = { > { "tps65950", 0 }, /* catalog version of twl5030 */ > { "tps65930", TPS_SUBSET }, /* fewer LDOs and DACs; no charger */ > { "tps65920", TPS_SUBSET }, /* fewer LDOs; no codec or charger */ > + { "tps65921", TPS_SUBSET }, /* fewer LDOs; no codec, no LED > + and vibrator. Charger in USB module*/ > { "twl6030", TWL6030_CLASS }, /* "Phoenix power chip" */ > { "twl6025", TWL6030_CLASS | TWL6025_SUBCLASS }, /* "Phoenix lite" */ > { /* end of list */ }, > -- > 1.7.4.4 > > -- > 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 -- 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
Hi Tony, On Fri, Jul 01, 2011 at 12:35:58AM -0700, Tony Lindgren wrote: > Samuel, > > * green@linuxhacker.ru <green@linuxhacker.ru> [110614 08:42]: > > From: Oleg Drokin <green@linuxhacker.ru> > > > > Very similar to TPS65920 > > List of differences: http://www.ti.com/litv/pdf/swcu066b > > > > CC: sameo@linux.intel.com > > Signed-off-by: Oleg Drokin <green@linuxhacker.ru> > > Looks like this one can be merged independently of the rest of the > Nook patches via your mfd tree. Care to queue this? I asked Oleg to rebase this patch against my for-next branch as it was not applying cleanly. But I never got the fixed patch. I fixed it up now, and it's applied. Cheers, Samuel.
* Samuel Ortiz <sameo@linux.intel.com> [110701 04:32]: > Hi Tony, > > On Fri, Jul 01, 2011 at 12:35:58AM -0700, Tony Lindgren wrote: > > Samuel, > > > > * green@linuxhacker.ru <green@linuxhacker.ru> [110614 08:42]: > > > From: Oleg Drokin <green@linuxhacker.ru> > > > > > > Very similar to TPS65920 > > > List of differences: http://www.ti.com/litv/pdf/swcu066b > > > > > > CC: sameo@linux.intel.com > > > Signed-off-by: Oleg Drokin <green@linuxhacker.ru> > > > > Looks like this one can be merged independently of the rest of the > > Nook patches via your mfd tree. Care to queue this? > I asked Oleg to rebase this patch against my for-next branch as it was not > applying cleanly. But I never got the fixed patch. > I fixed it up now, and it's applied. OK thanks! Tony -- 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
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index b8f2a4e..756f3eb 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -1284,6 +1284,8 @@ static const struct i2c_device_id twl_ids[] = { { "tps65950", 0 }, /* catalog version of twl5030 */ { "tps65930", TPS_SUBSET }, /* fewer LDOs and DACs; no charger */ { "tps65920", TPS_SUBSET }, /* fewer LDOs; no codec or charger */ + { "tps65921", TPS_SUBSET }, /* fewer LDOs; no codec, no LED + and vibrator. Charger in USB module*/ { "twl6030", TWL6030_CLASS }, /* "Phoenix power chip" */ { "twl6025", TWL6030_CLASS | TWL6025_SUBCLASS }, /* "Phoenix lite" */ { /* end of list */ },