| Message ID | 7812fb79beac0a6a409090f43d129893f9f93b5b.1386333697.git.stefan@agner.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Dec 06, 2013 at 01:51:45PM +0100, Stefan Agner wrote: > Use the VERSIONCRC to determine the exact device version. According to > the datasheet this register can be used as device identifier. The > identification is needed since some tps6586x regulators use a different > voltage table. > > Signed-off-by: Stefan Agner <stefan@agner.ch> > --- > Changes since v4: > - Use variable named version instead of ret > > Changes since v2: > - Avoid moving devm_kzalloc > --- > drivers/mfd/tps6586x.c | 50 +++++++++++++++++++++++++++++++++++++------- > include/linux/mfd/tps6586x.h | 7 +++++++ > 2 files changed, 49 insertions(+), 8 deletions(-) I think I also already gave my Reviewed-by on both this and 2/3, neither of which changed significantly enough to warrant that to be dropped. In general it's fine to keep Reviewed-by and Acked-by as long as you're only changing minor things. Thierry
Am 2013-12-06 15:26, schrieb Thierry Reding: > On Fri, Dec 06, 2013 at 01:51:45PM +0100, Stefan Agner wrote: >> Use the VERSIONCRC to determine the exact device version. According to >> the datasheet this register can be used as device identifier. The >> identification is needed since some tps6586x regulators use a different >> voltage table. >> >> Signed-off-by: Stefan Agner <stefan@agner.ch> >> --- >> Changes since v4: >> - Use variable named version instead of ret >> >> Changes since v2: >> - Avoid moving devm_kzalloc >> --- >> drivers/mfd/tps6586x.c | 50 +++++++++++++++++++++++++++++++++++++------- >> include/linux/mfd/tps6586x.h | 7 +++++++ >> 2 files changed, 49 insertions(+), 8 deletions(-) > > I think I also already gave my Reviewed-by on both this and 2/3, neither > of which changed significantly enough to warrant that to be dropped. In > general it's fine to keep Reviewed-by and Acked-by as long as you're > only changing minor things. > > Thierry Ok, sorry, didn't realize that is my job to pick them up when doing new revisions. Lee, can you add this when you apply this patch? Reviewed-by: Thierry Reding <treding@nvidia.com>
On Fri, 06 Dec 2013, Thierry Reding wrote: > On Fri, Dec 06, 2013 at 01:51:45PM +0100, Stefan Agner wrote: > > Use the VERSIONCRC to determine the exact device version. According to > > the datasheet this register can be used as device identifier. The > > identification is needed since some tps6586x regulators use a different > > voltage table. > > > > Signed-off-by: Stefan Agner <stefan@agner.ch> > > --- > > Changes since v4: > > - Use variable named version instead of ret > > > > Changes since v2: > > - Avoid moving devm_kzalloc > > --- > > drivers/mfd/tps6586x.c | 50 +++++++++++++++++++++++++++++++++++++------- > > include/linux/mfd/tps6586x.h | 7 +++++++ > > 2 files changed, 49 insertions(+), 8 deletions(-) > > I think I also already gave my Reviewed-by on both this and 2/3, neither > of which changed significantly enough to warrant that to be dropped. In > general it's fine to keep Reviewed-by and Acked-by as long as you're > only changing minor things. Don't worry Thierry, I'll ensure they are applied.
On Fri, 06 Dec 2013, Stefan Agner wrote: > Am 2013-12-06 15:26, schrieb Thierry Reding: > > On Fri, Dec 06, 2013 at 01:51:45PM +0100, Stefan Agner wrote: > >> Use the VERSIONCRC to determine the exact device version. According to > >> the datasheet this register can be used as device identifier. The > >> identification is needed since some tps6586x regulators use a different > >> voltage table. > >> > >> Signed-off-by: Stefan Agner <stefan@agner.ch> > >> --- > >> Changes since v4: > >> - Use variable named version instead of ret > >> > >> Changes since v2: > >> - Avoid moving devm_kzalloc > >> --- > >> drivers/mfd/tps6586x.c | 50 +++++++++++++++++++++++++++++++++++++------- > >> include/linux/mfd/tps6586x.h | 7 +++++++ > >> 2 files changed, 49 insertions(+), 8 deletions(-) > > > > I think I also already gave my Reviewed-by on both this and 2/3, neither > > of which changed significantly enough to warrant that to be dropped. In > > general it's fine to keep Reviewed-by and Acked-by as long as you're > > only changing minor things. > > > > Thierry > > Ok, sorry, didn't realize that is my job to pick them up when doing new > revisions. Lee, can you add this when you apply this patch? Will it's not legislation, but it does help us a great deal. > Reviewed-by: Thierry Reding <treding@nvidia.com> Sure.
On Fri, 06 Dec 2013, Stefan Agner wrote: > Use the VERSIONCRC to determine the exact device version. According to > the datasheet this register can be used as device identifier. The > identification is needed since some tps6586x regulators use a different > voltage table. > > Signed-off-by: Stefan Agner <stefan@agner.ch> > --- > Changes since v4: > - Use variable named version instead of ret > > Changes since v2: > - Avoid moving devm_kzalloc > --- > drivers/mfd/tps6586x.c | 50 +++++++++++++++++++++++++++++++++++++------- > include/linux/mfd/tps6586x.h | 7 +++++++ > 2 files changed, 49 insertions(+), 8 deletions(-) Applied with Acks.
On 12/06/2013 05:51 AM, Stefan Agner wrote: > Use the VERSIONCRC to determine the exact device version. According to > the datasheet this register can be used as device identifier. The > identification is needed since some tps6586x regulators use a different > voltage table. FWIW, this version looks good to me now.
On 12/06/2013 01:24 PM, Lee Jones wrote: > > On 6 Dec 2013 17:49, "Stephen Warren" <swarren@wwwdotorg.org > <mailto:swarren@wwwdotorg.org>> wrote: >> >> On 12/06/2013 05:51 AM, Stefan Agner wrote: >> > Use the VERSIONCRC to determine the exact device version. According to >> > the datasheet this register can be used as device identifier. The >> > identification is needed since some tps6586x regulators use a different >> > voltage table. >> >> FWIW, this version looks good to me now. > > If that's an Ack I can apply it. Yes, it is. I thought you said you'd already applied it though, so I didn't write the ack, but if not: Acked-by: Stephen Warren <swarren@nvidia.com>
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c index ee61fd7..6f2af9c 100644 --- a/drivers/mfd/tps6586x.c +++ b/drivers/mfd/tps6586x.c @@ -124,6 +124,7 @@ struct tps6586x { struct device *dev; struct i2c_client *client; struct regmap *regmap; + int version; int irq; struct irq_chip irq_chip; @@ -208,6 +209,14 @@ int tps6586x_irq_get_virq(struct device *dev, int irq) } EXPORT_SYMBOL_GPL(tps6586x_irq_get_virq); +int tps6586x_get_version(struct device *dev) +{ + struct tps6586x *tps6586x = dev_get_drvdata(dev); + + return tps6586x->version; +} +EXPORT_SYMBOL_GPL(tps6586x_get_version); + static int __remove_subdev(struct device *dev, void *unused) { platform_device_unregister(to_platform_device(dev)); @@ -472,12 +481,38 @@ static void tps6586x_power_off(void) tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT); } +static void tps6586x_print_version(struct i2c_client *client, int version) +{ + const char *name; + + switch (version) { + case TPS658621A: + name = "TPS658621A"; + break; + case TPS658621CD: + name = "TPS658621C/D"; + break; + case TPS658623: + name = "TPS658623"; + break; + case TPS658643: + name = "TPS658643"; + break; + default: + name = "TPS6586X"; + break; + } + + dev_info(&client->dev, "Found %s, VERSIONCRC is %02x\n", name, version); +} + static int tps6586x_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct tps6586x_platform_data *pdata = dev_get_platdata(&client->dev); struct tps6586x *tps6586x; int ret; + int version; if (!pdata && client->dev.of_node) pdata = tps6586x_parse_dt(client); @@ -487,19 +522,18 @@ static int tps6586x_i2c_probe(struct i2c_client *client, return -ENOTSUPP; } - ret = i2c_smbus_read_byte_data(client, TPS6586X_VERSIONCRC); - if (ret < 0) { - dev_err(&client->dev, "Chip ID read failed: %d\n", ret); + version = i2c_smbus_read_byte_data(client, TPS6586X_VERSIONCRC); + if (version < 0) { + dev_err(&client->dev, "Chip ID read failed: %d\n", version); return -EIO; } - dev_info(&client->dev, "VERSIONCRC is %02x\n", ret); - tps6586x = devm_kzalloc(&client->dev, sizeof(*tps6586x), GFP_KERNEL); - if (tps6586x == NULL) { - dev_err(&client->dev, "memory for tps6586x alloc failed\n"); + if (!tps6586x) return -ENOMEM; - } + + tps6586x->version = version; + tps6586x_print_version(client, tps6586x->version); tps6586x->client = client; tps6586x->dev = &client->dev; diff --git a/include/linux/mfd/tps6586x.h b/include/linux/mfd/tps6586x.h index 8799454..cbecec2 100644 --- a/include/linux/mfd/tps6586x.h +++ b/include/linux/mfd/tps6586x.h @@ -13,6 +13,12 @@ #define TPS6586X_SLEW_RATE_SET 0x08 #define TPS6586X_SLEW_RATE_MASK 0x07 +/* VERSION CRC */ +#define TPS658621A 0x15 +#define TPS658621CD 0x2c +#define TPS658623 0x1b +#define TPS658643 0x03 + enum { TPS6586X_ID_SYS, TPS6586X_ID_SM_0, @@ -97,5 +103,6 @@ extern int tps6586x_clr_bits(struct device *dev, int reg, uint8_t bit_mask); extern int tps6586x_update(struct device *dev, int reg, uint8_t val, uint8_t mask); extern int tps6586x_irq_get_virq(struct device *dev, int irq); +extern int tps6586x_get_version(struct device *dev); #endif /*__LINUX_MFD_TPS6586X_H */
Use the VERSIONCRC to determine the exact device version. According to the datasheet this register can be used as device identifier. The identification is needed since some tps6586x regulators use a different voltage table. Signed-off-by: Stefan Agner <stefan@agner.ch> --- Changes since v4: - Use variable named version instead of ret Changes since v2: - Avoid moving devm_kzalloc --- drivers/mfd/tps6586x.c | 50 +++++++++++++++++++++++++++++++++++++------- include/linux/mfd/tps6586x.h | 7 +++++++ 2 files changed, 49 insertions(+), 8 deletions(-)