hwmon: (lm85) support the LM96000

It has been supported as a generic lm85 for quite some time.

Signed-off-by: Jeremy Gebben <jgebben@sweptlaser.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/Documentation/hwmon/lm85 b/Documentation/hwmon/lm85
index 7c49feaa79d236824c109a865835a6618eb49523..4f531f4acc3f45911606fdab74eeaf4ff2f2fea2 100644 (file)
--- a/Documentation/hwmon/lm85
+++ b/Documentation/hwmon/lm85
@@ -3,9 +3,13 @@ Kernel driver lm85
 
 Supported chips:
   * National Semiconductor LM85 (B and C versions)
-    Prefix: 'lm85'
+    Prefix: 'lm85b' or 'lm85c'
     Addresses scanned: I2C 0x2c, 0x2d, 0x2e
     Datasheet: http://www.national.com/pf/LM/LM85.html
+  * Texas Instruments LM96000
+    Prefix: 'lm9600'
+    Addresses scanned: I2C 0x2c, 0x2d, 0x2e
+    Datasheet: http://www.ti.com/lit/ds/symlink/lm96000.pdf
   * Analog Devices ADM1027
     Prefix: 'adm1027'
     Addresses scanned: I2C 0x2c, 0x2d, 0x2e

diff --git a/drivers/hwmon/lm85.c b/drivers/hwmon/lm85.c
index 4b15193d195c413d783e4cefcc22ab1ef53b0497..b23cf8e4c54bf2131425b0c35206a203f470b848 100644 (file)
--- a/drivers/hwmon/lm85.c
+++ b/drivers/hwmon/lm85.c
@@ -41,7 +41,7 @@
 static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };
 
 enum chips {
-       lm85,
+       lm85, lm96000,
        adm1027, adt7463, adt7468,
        emc6d100, emc6d102, emc6d103, emc6d103s
 };
@@ -1499,7 +1499,7 @@ static int lm85_detect(struct i2c_client *client, struct i2c_board_info *info)
                                        "Found Winbond WPCD377I, ignoring\n");
                                return -ENODEV;
                        }
-                       type_name = "lm85";
+                       type_name = "lm96000";
                        break;
                }
        } else if (company == LM85_COMPANY_ANALOG_DEV) {
@@ -1623,6 +1623,7 @@ static const struct i2c_device_id lm85_id[] = {
        { "lm85", lm85 },
        { "lm85b", lm85 },
        { "lm85c", lm85 },
+       { "lm96000", lm96000 },
        { "emc6d100", emc6d100 },
        { "emc6d101", emc6d100 },
        { "emc6d102", emc6d102 },
@@ -1657,6 +1658,10 @@ static const struct of_device_id lm85_of_match[] = {
                .compatible = "national,lm85c",
                .data = (void *)lm85
        },
+       {
+               .compatible = "ti,lm96000",
+               .data = (void *)lm96000
+       },
        {
                .compatible = "smsc,emc6d100",
                .data = (void *)emc6d100