3 files changed, 103 insertions, 28 deletions

diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c
index 6a9d6edaacb3..a26b1d1d9514 100644
--- a/drivers/hwmon/pmbus/lm25066.c
+++ b/drivers/hwmon/pmbus/lm25066.c
@@ -1,5 +1,5 @@
 /*
- * Hardware monitoring driver for LM25056 / LM25066 / LM5064 / LM5066
+ * Hardware monitoring driver for LM25056 / LM25063 / LM25066 / LM5064 / LM5066
  *
  * Copyright (c) 2011 Ericsson AB.
  * Copyright (c) 2013 Guenter Roeck
@@ -27,7 +27,7 @@
 #include <linux/i2c.h>
 #include "pmbus.h"
 
-enum chips { lm25056, lm25066, lm5064, lm5066 };
+enum chips { lm25056, lm25063, lm25066, lm5064, lm5066 };
 
 #define LM25066_READ_VAUX               0xd0
 #define LM25066_MFR_READ_IIN            0xd1
@@ -52,6 +52,11 @@ enum chips { lm25056, lm25066, lm5064, lm5066 };
 #define LM25056_MFR_STS_VAUX_OV_WARN    (1 << 1)
 #define LM25056_MFR_STS_VAUX_UV_WARN    (1 << 0)
 
+/* LM25063 only */
+
+#define LM25063_READ_VOUT_MAX           0xe5
+#define LM25063_READ_VOUT_MIN           0xe6
+
 struct __coeff {
         short m, b, R;
 };
@@ -59,7 +64,7 @@ struct __coeff {
 #define PSC_CURRENT_IN_L        (PSC_NUM_CLASSES)
 #define PSC_POWER_L             (PSC_NUM_CLASSES + 1)
 
-static struct __coeff lm25066_coeff[4][PSC_NUM_CLASSES + 2] = {
+static struct __coeff lm25066_coeff[5][PSC_NUM_CLASSES + 2] = {
         [lm25056] = {
                 [PSC_VOLTAGE_IN] = {
                         .m = 16296,
@@ -116,6 +121,36 @@ static struct __coeff lm25066_coeff[4][PSC_NUM_CLASSES + 2] = {
                         .m = 16,
                 },
         },
+        [lm25063] = {
+                [PSC_VOLTAGE_IN] = {
+                        .m = 16000,
+                        .R = -2,
+                },
+                [PSC_VOLTAGE_OUT] = {
+                        .m = 16000,
+                        .R = -2,
+                },
+                [PSC_CURRENT_IN] = {
+                        .m = 10000,
+                        .R = -2,
+                },
+                [PSC_CURRENT_IN_L] = {
+                        .m = 10000,
+                        .R = -2,
+                },
+                [PSC_POWER] = {
+                        .m = 5000,
+                        .R = -3,
+                },
+                [PSC_POWER_L] = {
+                        .m = 5000,
+                        .R = -3,
+                },
+                [PSC_TEMPERATURE] = {
+                        .m = 15596,
+                        .R = -3,
+                },
+        },
         [lm5064] = {
                 [PSC_VOLTAGE_IN] = {
                         .m = 4611,
@@ -178,6 +213,7 @@ static struct __coeff lm25066_coeff[4][PSC_NUM_CLASSES + 2] = {
 
 struct lm25066_data {
         int id;
+        u16 rlimit;                     /* Maximum register value */
         struct pmbus_driver_info info;
 };
 
@@ -200,6 +236,10 @@ static int lm25066_read_word_data(struct i2c_client *client, int page, int reg)
                         /* VIN: 6.14 mV VAUX: 293 uV LSB */
                         ret = DIV_ROUND_CLOSEST(ret * 293, 6140);
                         break;
+                case lm25063:
+                        /* VIN: 6.25 mV VAUX: 200.0 uV LSB */
+                        ret = DIV_ROUND_CLOSEST(ret * 20, 625);
+                        break;
                 case lm25066:
                         /* VIN: 4.54 mV VAUX: 283.2 uV LSB */
                         ret = DIV_ROUND_CLOSEST(ret * 2832, 45400);
@@ -253,6 +293,24 @@ static int lm25066_read_word_data(struct i2c_client *client, int page, int reg)
         return ret;
 }
 
+static int lm25063_read_word_data(struct i2c_client *client, int page, int reg)
+{
+        int ret;
+
+        switch (reg) {
+        case PMBUS_VIRT_READ_VOUT_MAX:
+                ret = pmbus_read_word_data(client, 0, LM25063_READ_VOUT_MAX);
+                break;
+        case PMBUS_VIRT_READ_VOUT_MIN:
+                ret = pmbus_read_word_data(client, 0, LM25063_READ_VOUT_MIN);
+                break;
+        default:
+                ret = lm25066_read_word_data(client, page, reg);
+                break;
+        }
+        return ret;
+}
+
 static int lm25056_read_word_data(struct i2c_client *client, int page, int reg)
 {
         int ret;
@@ -308,27 +366,34 @@ static int lm25056_read_byte_data(struct i2c_client *client, int page, int reg)
 static int lm25066_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 lm25066_data *data = to_lm25066_data(info);
         int ret;
 
         switch (reg) {
+        case PMBUS_POUT_OP_FAULT_LIMIT:
+        case PMBUS_POUT_OP_WARN_LIMIT:
         case PMBUS_VOUT_UV_WARN_LIMIT:
         case PMBUS_OT_FAULT_LIMIT:
         case PMBUS_OT_WARN_LIMIT:
+        case PMBUS_IIN_OC_FAULT_LIMIT:
         case PMBUS_VIN_UV_WARN_LIMIT:
+        case PMBUS_VIN_UV_FAULT_LIMIT:
+        case PMBUS_VIN_OV_FAULT_LIMIT:
         case PMBUS_VIN_OV_WARN_LIMIT:
-                word = ((s16)word < 0) ? 0 : clamp_val(word, 0, 0x0fff);
+                word = ((s16)word < 0) ? 0 : clamp_val(word, 0, data->rlimit);
                 ret = pmbus_write_word_data(client, 0, reg, word);
                 pmbus_clear_cache(client);
                 break;
         case PMBUS_IIN_OC_WARN_LIMIT:
-                word = ((s16)word < 0) ? 0 : clamp_val(word, 0, 0x0fff);
+                word = ((s16)word < 0) ? 0 : clamp_val(word, 0, data->rlimit);
                 ret = pmbus_write_word_data(client, 0,
                                             LM25066_MFR_IIN_OC_WARN_LIMIT,
                                             word);
                 pmbus_clear_cache(client);
                 break;
         case PMBUS_PIN_OP_WARN_LIMIT:
-                word = ((s16)word < 0) ? 0 : clamp_val(word, 0, 0x0fff);
+                word = ((s16)word < 0) ? 0 : clamp_val(word, 0, data->rlimit);
                 ret = pmbus_write_word_data(client, 0,
                                             LM25066_MFR_PIN_OP_WARN_LIMIT,
                                             word);
@@ -337,7 +402,7 @@ static int lm25066_write_word_data(struct i2c_client *client, int page, int reg,
         case PMBUS_VIRT_VMON_UV_WARN_LIMIT:
                 /* Adjust from VIN coefficients (for LM25056) */
                 word = DIV_ROUND_CLOSEST((int)word * 6140, 293);
-                word = ((s16)word < 0) ? 0 : clamp_val(word, 0, 0x0fff);
+                word = ((s16)word < 0) ? 0 : clamp_val(word, 0, data->rlimit);
                 ret = pmbus_write_word_data(client, 0,
                                             LM25056_VAUX_UV_WARN_LIMIT, word);
                 pmbus_clear_cache(client);
@@ -345,7 +410,7 @@ static int lm25066_write_word_data(struct i2c_client *client, int page, int reg,
         case PMBUS_VIRT_VMON_OV_WARN_LIMIT:
                 /* Adjust from VIN coefficients (for LM25056) */
                 word = DIV_ROUND_CLOSEST((int)word * 6140, 293);
-                word = ((s16)word < 0) ? 0 : clamp_val(word, 0, 0x0fff);
+                word = ((s16)word < 0) ? 0 : clamp_val(word, 0, data->rlimit);
                 ret = pmbus_write_word_data(client, 0,
                                             LM25056_VAUX_OV_WARN_LIMIT, word);
                 pmbus_clear_cache(client);
@@ -399,9 +464,16 @@ static int lm25066_probe(struct i2c_client *client,
                 info->func[0] |= PMBUS_HAVE_STATUS_VMON;
                 info->read_word_data = lm25056_read_word_data;
                 info->read_byte_data = lm25056_read_byte_data;
+                data->rlimit = 0x0fff;
+        } else if (data->id == lm25063) {
+                info->func[0] |= PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT
+                  | PMBUS_HAVE_POUT;
+                info->read_word_data = lm25063_read_word_data;
+                data->rlimit = 0xffff;
         } else {
                 info->func[0] |= PMBUS_HAVE_VOUT | PMBUS_HAVE_STATUS_VOUT;
                 info->read_word_data = lm25066_read_word_data;
+                data->rlimit = 0x0fff;
         }
         info->write_word_data = lm25066_write_word_data;
 
@@ -432,6 +504,7 @@ static int lm25066_probe(struct i2c_client *client,
 
 static const struct i2c_device_id lm25066_id[] = {
         {"lm25056", lm25056},
+        {"lm25063", lm25063},
         {"lm25066", lm25066},
         {"lm5064", lm5064},
         {"lm5066", lm5066},
@@ -453,5 +526,5 @@ static struct i2c_driver lm25066_driver = {
 module_i2c_driver(lm25066_driver);
 
 MODULE_AUTHOR("Guenter Roeck");
-MODULE_DESCRIPTION("PMBus driver for LM25056/LM25066/LM5064/LM5066");
+MODULE_DESCRIPTION("PMBus driver for LM25066 and compatible chips");
 MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/pmbus/ltc2978.c b/drivers/hwmon/pmbus/ltc2978.c
index 586a89ef9e0f..de3c152a1d9a 100644
--- a/drivers/hwmon/pmbus/ltc2978.c
+++ b/drivers/hwmon/pmbus/ltc2978.c
@@ -1,5 +1,6 @@
 /*
- * Hardware monitoring driver for LTC2974, LTC2978, LTC3880, and LTC3883
+ * Hardware monitoring driver for LTC2974, LTC2977, LTC2978, LTC3880,
+ * and LTC3883
  *
  * Copyright (c) 2011 Ericsson AB.
  * Copyright (c) 2013 Guenter Roeck
@@ -27,7 +28,7 @@
 #include <linux/i2c.h>
 #include "pmbus.h"
 
-enum chips { ltc2974, ltc2978, ltc3880, ltc3883 };
+enum chips { ltc2974, ltc2977, ltc2978, ltc3880, ltc3883 };
 
 /* Common for all chips */
 #define LTC2978_MFR_VOUT_PEAK           0xdd
@@ -35,7 +36,7 @@ enum chips { ltc2974, ltc2978, ltc3880, ltc3883 };
 #define LTC2978_MFR_TEMPERATURE_PEAK    0xdf
 #define LTC2978_MFR_SPECIAL_ID          0xe7
 
-/* LTC2974 and LTC2978 */
+/* LTC2974, LCT2977, and LTC2978 */
 #define LTC2978_MFR_VOUT_MIN            0xfb
 #define LTC2978_MFR_VIN_MIN             0xfc
 #define LTC2978_MFR_TEMPERATURE_MIN     0xfd
@@ -53,8 +54,10 @@ enum chips { ltc2974, ltc2978, ltc3880, ltc3883 };
 #define LTC3883_MFR_IIN_PEAK            0xe1
 
 #define LTC2974_ID                      0x0212
+#define LTC2977_ID                      0x0130
 #define LTC2978_ID_REV1                 0x0121
 #define LTC2978_ID_REV2                 0x0122
+#define LTC2978A_ID                     0x0124
 #define LTC3880_ID                      0x4000
 #define LTC3880_ID_MASK                 0xff00
 #define LTC3883_ID                      0x4300
@@ -363,6 +366,7 @@ static int ltc2978_write_word_data(struct i2c_client *client, int page,
 
 static const struct i2c_device_id ltc2978_id[] = {
         {"ltc2974", ltc2974},
+        {"ltc2977", ltc2977},
         {"ltc2978", ltc2978},
         {"ltc3880", ltc3880},
         {"ltc3883", ltc3883},
@@ -392,7 +396,10 @@ static int ltc2978_probe(struct i2c_client *client,
 
         if (chip_id == LTC2974_ID) {
                 data->id = ltc2974;
-        } else if (chip_id == LTC2978_ID_REV1 || chip_id == LTC2978_ID_REV2) {
+        } else if (chip_id == LTC2977_ID) {
+                data->id = ltc2977;
+        } else if (chip_id == LTC2978_ID_REV1 || chip_id == LTC2978_ID_REV2 ||
+                   chip_id == LTC2978A_ID) {
                 data->id = ltc2978;
         } else if ((chip_id & LTC3880_ID_MASK) == LTC3880_ID) {
                 data->id = ltc3880;
@@ -438,6 +445,7 @@ static int ltc2978_probe(struct i2c_client *client,
                           | PMBUS_HAVE_IOUT | PMBUS_HAVE_STATUS_IOUT;
                 }
                 break;
+        case ltc2977:
         case ltc2978:
                 info->read_word_data = ltc2978_read_word_data;
                 info->pages = LTC2978_NUM_PAGES;
diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
index 9319fcf142d9..3cbf66e9d861 100644
--- a/drivers/hwmon/pmbus/pmbus_core.c
+++ b/drivers/hwmon/pmbus/pmbus_core.c
@@ -97,6 +97,7 @@ struct pmbus_data {
         int max_attributes;
         int num_attributes;
         struct attribute_group group;
+        const struct attribute_group *groups[2];
 
         struct pmbus_sensor *sensors;
 
@@ -156,7 +157,7 @@ EXPORT_SYMBOL_GPL(pmbus_write_byte);
 
 /*
  * _pmbus_write_byte() is similar to pmbus_write_byte(), but checks if
- * a device specific mapping funcion exists and calls it if necessary.
+ * a device specific mapping function exists and calls it if necessary.
  */
 static int _pmbus_write_byte(struct i2c_client *client, int page, u8 value)
 {
@@ -348,7 +349,7 @@ static struct _pmbus_status {
 
 static struct pmbus_data *pmbus_update_device(struct device *dev)
 {
-        struct i2c_client *client = to_i2c_client(dev);
+        struct i2c_client *client = to_i2c_client(dev->parent);
         struct pmbus_data *data = i2c_get_clientdata(client);
         const struct pmbus_driver_info *info = data->info;
         struct pmbus_sensor *sensor;
@@ -686,7 +687,7 @@ static int pmbus_get_boolean(struct pmbus_data *data, struct pmbus_boolean *b,
         if (!s1 && !s2) {
                 ret = !!regval;
         } else if (!s1 || !s2) {
-                BUG();
+                WARN(1, "Bad boolean descriptor %p: s1=%p, s2=%p\n", b, s1, s2);
                 return 0;
         } else {
                 long v1, v2;
@@ -733,7 +734,7 @@ static ssize_t pmbus_set_sensor(struct device *dev,
                                 struct device_attribute *devattr,
                                 const char *buf, size_t count)
 {
-        struct i2c_client *client = to_i2c_client(dev);
+        struct i2c_client *client = to_i2c_client(dev->parent);
         struct pmbus_data *data = i2c_get_clientdata(client);
         struct pmbus_sensor *sensor = to_pmbus_sensor(devattr);
         ssize_t rv = count;
@@ -1768,22 +1769,16 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
                 goto out_kfree;
         }
 
-        /* Register sysfs hooks */
-        ret = sysfs_create_group(&dev->kobj, &data->group);
-        if (ret) {
-                dev_err(dev, "Failed to create sysfs entries\n");
-                goto out_kfree;
-        }
-        data->hwmon_dev = hwmon_device_register(dev);
+        data->groups[0] = &data->group;
+        data->hwmon_dev = hwmon_device_register_with_groups(dev, client->name,
+                                                            data, data->groups);
         if (IS_ERR(data->hwmon_dev)) {
                 ret = PTR_ERR(data->hwmon_dev);
                 dev_err(dev, "Failed to register hwmon device\n");
-                goto out_hwmon_device_register;
+                goto out_kfree;
         }
         return 0;
 
-out_hwmon_device_register:
-        sysfs_remove_group(&dev->kobj, &data->group);
 out_kfree:
         kfree(data->group.attrs);
         return ret;
@@ -1794,7 +1789,6 @@ int pmbus_do_remove(struct i2c_client *client)
 {
         struct pmbus_data *data = i2c_get_clientdata(client);
         hwmon_device_unregister(data->hwmon_dev);
-        sysfs_remove_group(&client->dev.kobj, &data->group);
         kfree(data->group.attrs);
         return 0;
 }