1 files changed, 119 insertions, 20 deletions

diff --git a/drivers/hwmon/pmbus/max34440.c b/drivers/hwmon/pmbus/max34440.c
index 9b97a5b3cf3d..2ada7b021fbe 100644
--- a/drivers/hwmon/pmbus/max34440.c
+++ b/drivers/hwmon/pmbus/max34440.c
@@ -25,34 +25,82 @@
 #include <linux/i2c.h>
 #include "pmbus.h"
 
-enum chips { max34440, max34441 };
+enum chips { max34440, max34441, max34446 };
 
 #define MAX34440_MFR_VOUT_PEAK          0xd4
 #define MAX34440_MFR_IOUT_PEAK          0xd5
 #define MAX34440_MFR_TEMPERATURE_PEAK   0xd6
+#define MAX34440_MFR_VOUT_MIN           0xd7
+
+#define MAX34446_MFR_POUT_PEAK          0xe0
+#define MAX34446_MFR_POUT_AVG           0xe1
+#define MAX34446_MFR_IOUT_AVG           0xe2
+#define MAX34446_MFR_TEMPERATURE_AVG    0xe3
 
 #define MAX34440_STATUS_OC_WARN         (1 << 0)
 #define MAX34440_STATUS_OC_FAULT        (1 << 1)
 #define MAX34440_STATUS_OT_FAULT        (1 << 5)
 #define MAX34440_STATUS_OT_WARN         (1 << 6)
 
+struct max34440_data {
+        int id;
+        struct pmbus_driver_info info;
+};
+
+#define to_max34440_data(x)  container_of(x, struct max34440_data, info)
+
 static int max34440_read_word_data(struct i2c_client *client, int page, int reg)
 {
         int ret;
+        const struct pmbus_driver_info *info = pmbus_get_driver_info(client);
+        const struct max34440_data *data = to_max34440_data(info);
 
         switch (reg) {
+        case PMBUS_VIRT_READ_VOUT_MIN:
+                ret = pmbus_read_word_data(client, page,
+                                           MAX34440_MFR_VOUT_MIN);
+                break;
         case PMBUS_VIRT_READ_VOUT_MAX:
                 ret = pmbus_read_word_data(client, page,
                                            MAX34440_MFR_VOUT_PEAK);
                 break;
+        case PMBUS_VIRT_READ_IOUT_AVG:
+                if (data->id != max34446)
+                        return -ENXIO;
+                ret = pmbus_read_word_data(client, page,
+                                           MAX34446_MFR_IOUT_AVG);
+                break;
         case PMBUS_VIRT_READ_IOUT_MAX:
                 ret = pmbus_read_word_data(client, page,
                                            MAX34440_MFR_IOUT_PEAK);
                 break;
+        case PMBUS_VIRT_READ_POUT_AVG:
+                if (data->id != max34446)
+                        return -ENXIO;
+                ret = pmbus_read_word_data(client, page,
+                                           MAX34446_MFR_POUT_AVG);
+                break;
+        case PMBUS_VIRT_READ_POUT_MAX:
+                if (data->id != max34446)
+                        return -ENXIO;
+                ret = pmbus_read_word_data(client, page,
+                                           MAX34446_MFR_POUT_PEAK);
+                break;
+        case PMBUS_VIRT_READ_TEMP_AVG:
+                if (data->id != max34446)
+                        return -ENXIO;
+                ret = pmbus_read_word_data(client, page,
+                                           MAX34446_MFR_TEMPERATURE_AVG);
+                break;
         case PMBUS_VIRT_READ_TEMP_MAX:
                 ret = pmbus_read_word_data(client, page,
                                            MAX34440_MFR_TEMPERATURE_PEAK);
                 break;
+        case PMBUS_VIRT_RESET_POUT_HISTORY:
+                if (data->id != max34446)
+                        return -ENXIO;
+                ret = 0;
+                break;
         case PMBUS_VIRT_RESET_VOUT_HISTORY:
         case PMBUS_VIRT_RESET_IOUT_HISTORY:
         case PMBUS_VIRT_RESET_TEMP_HISTORY:
@@ -68,21 +116,42 @@ static int max34440_read_word_data(struct i2c_client *client, int page, int reg)
 static int max34440_write_word_data(struct i2c_client *client, int page,
                                     int reg, u16 word)
 {
+        const struct pmbus_driver_info *info = pmbus_get_driver_info(client);
+        const struct max34440_data *data = to_max34440_data(info);
         int ret;
 
         switch (reg) {
+        case PMBUS_VIRT_RESET_POUT_HISTORY:
+                ret = pmbus_write_word_data(client, page,
+                                            MAX34446_MFR_POUT_PEAK, 0);
+                if (ret)
+                        break;
+                ret = pmbus_write_word_data(client, page,
+                                            MAX34446_MFR_POUT_AVG, 0);
+                break;
         case PMBUS_VIRT_RESET_VOUT_HISTORY:
                 ret = pmbus_write_word_data(client, page,
+                                            MAX34440_MFR_VOUT_MIN, 0x7fff);
+                if (ret)
+                        break;
+                ret = pmbus_write_word_data(client, page,
                                             MAX34440_MFR_VOUT_PEAK, 0);
                 break;
         case PMBUS_VIRT_RESET_IOUT_HISTORY:
                 ret = pmbus_write_word_data(client, page,
                                             MAX34440_MFR_IOUT_PEAK, 0);
+                if (!ret && data->id == max34446)
+                        ret = pmbus_write_word_data(client, page,
+                                        MAX34446_MFR_IOUT_AVG, 0);
+
                 break;
         case PMBUS_VIRT_RESET_TEMP_HISTORY:
                 ret = pmbus_write_word_data(client, page,
                                             MAX34440_MFR_TEMPERATURE_PEAK,
                                             0x8000);
+                if (!ret && data->id == max34446)
+                        ret = pmbus_write_word_data(client, page,
+                                        MAX34446_MFR_TEMPERATURE_AVG, 0);
                 break;
         default:
                 ret = -ENODATA;
@@ -216,26 +285,66 @@ static struct pmbus_driver_info max34440_info[] = {
                 .read_word_data = max34440_read_word_data,
                 .write_word_data = max34440_write_word_data,
         },
+        [max34446] = {
+                .pages = 7,
+                .format[PSC_VOLTAGE_IN] = direct,
+                .format[PSC_VOLTAGE_OUT] = direct,
+                .format[PSC_TEMPERATURE] = direct,
+                .format[PSC_CURRENT_OUT] = direct,
+                .format[PSC_POWER] = direct,
+                .m[PSC_VOLTAGE_IN] = 1,
+                .b[PSC_VOLTAGE_IN] = 0,
+                .R[PSC_VOLTAGE_IN] = 3,
+                .m[PSC_VOLTAGE_OUT] = 1,
+                .b[PSC_VOLTAGE_OUT] = 0,
+                .R[PSC_VOLTAGE_OUT] = 3,
+                .m[PSC_CURRENT_OUT] = 1,
+                .b[PSC_CURRENT_OUT] = 0,
+                .R[PSC_CURRENT_OUT] = 3,
+                .m[PSC_POWER] = 1,
+                .b[PSC_POWER] = 0,
+                .R[PSC_POWER] = 3,
+                .m[PSC_TEMPERATURE] = 1,
+                .b[PSC_TEMPERATURE] = 0,
+                .R[PSC_TEMPERATURE] = 2,
+                .func[0] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT
+                  | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_POUT,
+                .func[1] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT
+                  | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT,
+                .func[2] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT
+                  | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT | PMBUS_HAVE_POUT,
+                .func[3] = PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT
+                  | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT,
+                .func[4] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,
+                .func[5] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,
+                .func[6] = PMBUS_HAVE_TEMP | PMBUS_HAVE_STATUS_TEMP,
+                .read_byte_data = max34440_read_byte_data,
+                .read_word_data = max34440_read_word_data,
+                .write_word_data = max34440_write_word_data,
+        },
 };
 
 static int max34440_probe(struct i2c_client *client,
                           const struct i2c_device_id *id)
 {
-        return pmbus_do_probe(client, id, &max34440_info[id->driver_data]);
-}
+        struct max34440_data *data;
 
-static int max34440_remove(struct i2c_client *client)
-{
-        pmbus_do_remove(client);
-        return 0;
+        data = devm_kzalloc(&client->dev, sizeof(struct max34440_data),
+                            GFP_KERNEL);
+        if (!data)
+                return -ENOMEM;
+        data->id = id->driver_data;
+        data->info = max34440_info[id->driver_data];
+
+        return pmbus_do_probe(client, id, &data->info);
 }
 
 static const struct i2c_device_id max34440_id[] = {
         {"max34440", max34440},
         {"max34441", max34441},
+        {"max34446", max34446},
         {}
 };
-
 MODULE_DEVICE_TABLE(i2c, max34440_id);
 
 /* This is the driver that will be inserted */
@@ -244,22 +353,12 @@ static struct i2c_driver max34440_driver = {
                    .name = "max34440",
                    },
         .probe = max34440_probe,
-        .remove = max34440_remove,
+        .remove = pmbus_do_remove,
         .id_table = max34440_id,
 };
 
-static int __init max34440_init(void)
-{
-        return i2c_add_driver(&max34440_driver);
-}
-
-static void __exit max34440_exit(void)
-{
-        i2c_del_driver(&max34440_driver);
-}
+module_i2c_driver(max34440_driver);
 
 MODULE_AUTHOR("Guenter Roeck");
 MODULE_DESCRIPTION("PMBus driver for Maxim MAX34440/MAX34441");
 MODULE_LICENSE("GPL");
-module_init(max34440_init);
-module_exit(max34440_exit);