Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / drivers / hwmon / pmbus / lm25066.c

diff --git a/drivers/hwmon/pmbus/lm25066.c b/drivers/hwmon/pmbus/lm25066.c
index 10d17fb8f283670a2df80e3ab82b635c32abece3..53db78753a0d1f3d5da6f26040f1e53dc130db17 100644 (file)
--- a/drivers/hwmon/pmbus/lm25066.c
+++ b/drivers/hwmon/pmbus/lm25066.c
@@ -1,5 +1,5 @@
 /*
- * Hardware monitoring driver for LM25056 / LM25063 / LM25066 / LM5064 / LM5066
+ * Hardware monitoring driver for LM25056 / LM25066 / LM5064 / LM5066
  *
  * Copyright (c) 2011 Ericsson AB.
  * Copyright (c) 2013 Guenter Roeck
@@ -28,7 +28,7 @@
 #include <linux/i2c.h>
 #include "pmbus.h"
 
-enum chips { lm25056, lm25063, lm25066, lm5064, lm5066, lm5066i };
+enum chips { lm25056, lm25066, lm5064, lm5066, lm5066i };
 
 #define LM25066_READ_VAUX              0xd0
 #define LM25066_MFR_READ_IIN           0xd1
@@ -53,11 +53,6 @@ enum chips { lm25056, lm25063, lm25066, lm5064, lm5066, lm5066i };
 #define LM25056_MFR_STS_VAUX_OV_WARN   BIT(1)
 #define LM25056_MFR_STS_VAUX_UV_WARN   BIT(0)
 
-/* LM25063 only */
-
-#define LM25063_READ_VOUT_MAX          0xe5
-#define LM25063_READ_VOUT_MIN          0xe6
-
 struct __coeff {
        short m, b, R;
 };
@@ -122,36 +117,6 @@ static struct __coeff lm25066_coeff[6][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,
@@ -272,10 +237,6 @@ 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);
@@ -330,24 +291,6 @@ 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;
@@ -502,11 +445,6 @@ static int lm25066_probe(struct i2c_client *client,
                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;
@@ -543,7 +481,6 @@ 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},