| Message ID | CAJCfHmVyaDPh0_ThPjhBP0zMO1oE1AR=4=Zsa0cMPXU3J4v6dw@mail.gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v3] hwmon: (pmbus/tps53679) Add support for TPS53685 | expand |
On 2/10/25 19:20, ChiangBrian 江泳緻 TAO wrote: > From: Brian Chiang<chiang.brian@inventec.com> > > The TPS53685 is a fully AMD SVI3 compliant step down > controller with trans-inductor voltage regulator > (TLVR) topology support, dual channels, built-in > non-volatile memory (NVM), PMBus™ interface, and > full compatible with TI NexFET™ smart power > stages. > Add support for it to the tps53679 driver. > > Signed-off-by: Chiang Brian <chiang.brian@inventec.com> > --- Change log goes here. I don't recall the content of v2, so this patch goes to the end of my review queue. Immediate comments below, though. > drivers/hwmon/pmbus/tps53679.c | 31 ++++++++++++++++++++++++------- > 1 file changed, 24 insertions(+), 7 deletions(-) > > diff --git a/drivers/hwmon/pmbus/tps53679.c b/drivers/hwmon/pmbus/tps53679.c > index 63524dff5e75..5b5125c67e55 100644 > --- a/drivers/hwmon/pmbus/tps53679.c > +++ b/drivers/hwmon/pmbus/tps53679.c > @@ -16,7 +16,7 @@ > #include "pmbus.h" > > enum chips { > - tps53647, tps53667, tps53676, tps53679, tps53681, tps53688 > + tps53647, tps53667, tps53676, tps53679, tps53681, tps53685, tps53688 > }; > > #define TPS53647_PAGE_NUM 1 > @@ -31,7 +31,8 @@ enum chips { > #define TPS53679_PROT_VR13_5MV 0x07 /* VR13.0 mode, 5-mV DAC */ > #define TPS53679_PAGE_NUM 2 > > -#define TPS53681_DEVICE_ID 0x81 > +#define TPS53681_DEVICE_ID "\x81" > +#define TPS53685_DEVICE_ID "TIShP" > > #define TPS53681_PMBUS_REVISION 0x33 > > @@ -86,7 +87,7 @@ static int tps53679_identify_phases(struct i2c_client *client, > } > > static int tps53679_identify_chip(struct i2c_client *client, > - u8 revision, u16 id) > + u8 revision, char *id) > { > u8 buf[I2C_SMBUS_BLOCK_MAX]; > int ret; > @@ -102,11 +103,11 @@ static int tps53679_identify_chip(struct > i2c_client *client, > ret = i2c_smbus_read_block_data(client, PMBUS_IC_DEVICE_ID, buf); > if (ret < 0) > return ret; > - if (ret != 1 || buf[0] != id) { > - dev_err(&client->dev, "Unexpected device ID 0x%x\n", buf[0]); > + if (strncmp(id, buf, ret)) { This will successfully match any substring of "TIShP". > + dev_err(&client->dev, "Unexpected device ID: %*ph\n", buf); > return -ENODEV; > } > - return 0; > + return ret; This is an unacceptable and unnecessary API change. > } > > /* > @@ -138,6 +139,14 @@ static int tps53679_identify(struct i2c_client *client, > return tps53679_identify_mode(client, info); > } > > +static int tps53685_identify(struct i2c_client *client, > + struct pmbus_driver_info *info) > +{ > + info->format[PSC_VOLTAGE_OUT] = linear; > + return tps53679_identify_chip(client, TPS53681_PMBUS_REVISION, > + TPS53685_DEVICE_ID); > +} > + > static int tps53681_identify(struct i2c_client *client, > struct pmbus_driver_info *info) > { > @@ -215,7 +224,9 @@ static struct pmbus_driver_info tps53679_info = { > PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | > PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | > PMBUS_HAVE_POUT, > - .func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | > + .func[1] = PMBUS_HAVE_VIN | PMBUS_HAVE_IIN | PMBUS_HAVE_PIN | > + PMBUS_HAVE_STATUS_INPUT | > + PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT | > PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | > PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP | > PMBUS_HAVE_POUT, > @@ -263,6 +274,10 @@ static int tps53679_probe(struct i2c_client *client) > info->identify = tps53681_identify; > info->read_word_data = tps53681_read_word_data; > break; > + case tps53685: > + info->pages = TPS53679_PAGE_NUM; > + info->identify = tps53685_identify; > + break; > default: > return -ENODEV; > } > @@ -277,6 +292,7 @@ static const struct i2c_device_id tps53679_id[] = { > {"tps53676", tps53676}, > {"tps53679", tps53679}, > {"tps53681", tps53681}, > + {"tps53685", tps53685}, > {"tps53688", tps53688}, > {} > }; > @@ -289,6 +305,7 @@ static const struct of_device_id __maybe_unused > tps53679_of_match[] = { > {.compatible = "ti,tps53676", .data = (void *)tps53676}, > {.compatible = "ti,tps53679", .data = (void *)tps53679}, > {.compatible = "ti,tps53681", .data = (void *)tps53681}, > + {.compatible = "ti,tps53685", .data = (void *)tps53685}, > {.compatible = "ti,tps53688", .data = (void *)tps53688}, > {} > };
diff --git a/drivers/hwmon/pmbus/tps53679.c b/drivers/hwmon/pmbus/tps53679.c index 63524dff5e75..5b5125c67e55 100644 --- a/drivers/hwmon/pmbus/tps53679.c +++ b/drivers/hwmon/pmbus/tps53679.c @@ -16,7 +16,7 @@ #include "pmbus.h" enum chips { - tps53647, tps53667, tps53676, tps53679, tps53681, tps53688 + tps53647, tps53667, tps53676, tps53679, tps53681, tps53685, tps53688 }; #define TPS53647_PAGE_NUM 1 @@ -31,7 +31,8 @@ enum chips { #define TPS53679_PROT_VR13_5MV 0x07 /* VR13.0 mode, 5-mV DAC */ #define TPS53679_PAGE_NUM 2 -#define TPS53681_DEVICE_ID 0x81 +#define TPS53681_DEVICE_ID "\x81" +#define TPS53685_DEVICE_ID "TIShP" #define TPS53681_PMBUS_REVISION 0x33 @@ -86,7 +87,7 @@ static int tps53679_identify_phases(struct i2c_client *client, } static int tps53679_identify_chip(struct i2c_client *client, - u8 revision, u16 id) + u8 revision, char *id) { u8 buf[I2C_SMBUS_BLOCK_MAX]; int ret; @@ -102,11 +103,11 @@ static int tps53679_identify_chip(struct i2c_client *client, ret = i2c_smbus_read_block_data(client, PMBUS_IC_DEVICE_ID, buf); if (ret < 0) return ret; - if (ret != 1 || buf[0] != id) { - dev_err(&client->dev, "Unexpected device ID 0x%x\n", buf[0]); + if (strncmp(id, buf, ret)) { + dev_err(&client->dev, "Unexpected device ID: %*ph\n", buf); return -ENODEV; } - return 0; + return ret; }