[PATCH v2] hwmon: (pmbus/tps53679) Add support for TPS53685

[ChiangBrian 江泳緻 TAO <chiang.brian@xxxxxxxxxxxx>]

From: Brian Chiang<chiang.brian@xxxxxxxxxxxx>

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@xxxxxxxxxxxx>
---
 drivers/hwmon/pmbus/tps53679.c | 35 ++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/drivers/hwmon/pmbus/tps53679.c b/drivers/hwmon/pmbus/tps53679.c
index 63524dff5e75..b2b8b548fc00 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,10 +87,10 @@ 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;
+   int ret, len;

    ret = pmbus_read_byte_data(client, 0, PMBUS_REVISION);
    if (ret < 0)
@@ -100,13 +101,14 @@ static int tps53679_identify_chip(struct
i2c_client *client,
    }

    ret = i2c_smbus_read_block_data(client, PMBUS_IC_DEVICE_ID, buf);
+   len = strlen(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 (ret == len && strncmp(id, buf, len)) {
+       dev_err(&client->dev, "Unexpected device ID: %*ph\n", buf);
        return -ENODEV;
    }
-   return 0;
+   return len;
 }

 /*
@@ -138,6 +140,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)
+{
+   return tps53679_identify_multiphase(client, info,
+                       TPS53681_PMBUS_REVISION,
+                       TPS53685_DEVICE_ID);
+}
+
 static int tps53681_identify(struct i2c_client *client,
                 struct pmbus_driver_info *info)
 {
@@ -215,7 +225,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 +275,11 @@ 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 = 2;
+       info->identify = tps53685_identify;
+       info->format[PSC_VOLTAGE_OUT] = linear;
+       break;
    default:
        return -ENODEV;
    }
@@ -277,6 +294,7 @@ static const struct i2c_device_id tps53679_id[] = {
    {"tps53676", tps53676},
    {"tps53679", tps53679},
    {"tps53681", tps53681},
+   {"tps53685", tps53685},
    {"tps53688", tps53688},
    {}
 };
@@ -289,6 +307,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},
    {}
 };
-- 
2.25.1