hwmon: (lm95245) Add support for LM95235

LM95235 is register compatible to LM95245.

Also update link to LM95245 data sheet, and drop the link to the
datasheet from the driver source to simplify code maintenance.

Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/Documentation/hwmon/lm95245 b/Documentation/hwmon/lm95245
index 77eaf28..d755901 100644 (file)
--- a/Documentation/hwmon/lm95245
+++ b/Documentation/hwmon/lm95245
@@ -2,10 +2,14 @@ Kernel driver lm95245
 ==================
 
 Supported chips:
-  * National Semiconductor LM95245
+  * TI LM95235
+    Addresses scanned: I2C 0x18, 0x29, 0x4c
+    Datasheet: Publicly available at the TI website
+               http://www.ti.com/lit/ds/symlink/lm95235.pdf
+  * TI / National Semiconductor LM95245
     Addresses scanned: I2C 0x18, 0x19, 0x29, 0x4c, 0x4d
-    Datasheet: Publicly available at the National Semiconductor website
-               http://www.national.com/mpf/LM/LM95245.html
+    Datasheet: Publicly available at the TI website
+               http://www.ti.com/lit/ds/symlink/lm95245.pdf
 
 
 Author: Alexander Stein <alexander.stein@systec-electronic.com>
@@ -13,10 +17,10 @@ Author: Alexander Stein <alexander.stein@systec-electronic.com>
 Description
 -----------
 
-The LM95245 is an 11-bit digital temperature sensor with a 2-wire System
+LM95235 and LM95245 are 11-bit digital temperature sensors with a 2-wire System
 Management Bus (SMBus) interface and TruTherm technology that can monitor
 the temperature of a remote diode as well as its own temperature.
-The LM95245 can be used to very accurately monitor the temperature of
+The chips can be used to very accurately monitor the temperature of
 external devices such as microprocessors.
 
 All temperature values are given in millidegrees Celsius. Local temperature

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index fcca19b..085f5a8 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -1048,10 +1048,11 @@ config SENSORS_LM95241
          will be called lm95241.
 
 config SENSORS_LM95245
-       tristate "National Semiconductor LM95245 sensor chip"
+       tristate "National Semiconductor LM95245 and compatibles"
        depends on I2C
        help
-         If you say yes here you get support for LM95245 sensor chip.
+         If you say yes here you get support for LM95235 and LM95245
+         temperature sensor chips.
 
          This driver can also be built as a module.  If so, the module
          will be called lm95245.

diff --git a/drivers/hwmon/lm95245.c b/drivers/hwmon/lm95245.c
index 0ae0dfd..e7aef45 100644 (file)
--- a/drivers/hwmon/lm95245.c
+++ b/drivers/hwmon/lm95245.c
@@ -1,10 +1,8 @@
 /*
  * Copyright (C) 2011 Alexander Stein <alexander.stein@systec-electronic.com>
  *
- * The LM95245 is a sensor chip made by National Semiconductors.
+ * The LM95245 is a sensor chip made by TI / National Semiconductor.
  * It reports up to two temperatures (its own plus an external one).
- * Complete datasheet can be obtained from National's website at:
- *   http://www.national.com/ds.cgi/LM/LM95245.pdf
  *
  * This driver is based on lm95241.c
  *
@@ -34,8 +32,6 @@
 #include <linux/mutex.h>
 #include <linux/sysfs.h>
 
-#define DEVNAME "lm95245"
-
 static const unsigned short normal_i2c[] = {
        0x18, 0x19, 0x29, 0x4c, 0x4d, I2C_CLIENT_END };
 
@@ -98,7 +94,8 @@ static const unsigned short normal_i2c[] = {
 #define STATUS1_LOC            0x01
 
 #define MANUFACTURER_ID                0x01
-#define DEFAULT_REVISION       0xB3
+#define LM95235_REVISION       0xB1
+#define LM95245_REVISION       0xB3
 
 static const u8 lm95245_reg_address[] = {
        LM95245_REG_R_LOCAL_TEMPH_S,
@@ -427,17 +424,32 @@ static int lm95245_detect(struct i2c_client *new_client,
                          struct i2c_board_info *info)
 {
        struct i2c_adapter *adapter = new_client->adapter;
+       int address = new_client->addr;
+       const char *name;
+       int rev, id;
 
        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
                return -ENODEV;
 
-       if (i2c_smbus_read_byte_data(new_client, LM95245_REG_R_MAN_ID)
-                       != MANUFACTURER_ID
-               || i2c_smbus_read_byte_data(new_client, LM95245_REG_R_CHIP_ID)
-                       != DEFAULT_REVISION)
+       id = i2c_smbus_read_byte_data(new_client, LM95245_REG_R_MAN_ID);
+       if (id != MANUFACTURER_ID)
                return -ENODEV;
 
-       strlcpy(info->type, DEVNAME, I2C_NAME_SIZE);
+       rev = i2c_smbus_read_byte_data(new_client, LM95245_REG_R_CHIP_ID);
+       switch (rev) {
+       case LM95235_REVISION:
+               if (address != 0x18 && address != 0x29 && address != 0x4c)
+                       return -ENODEV;
+               name = "lm95235";
+               break;
+       case LM95245_REVISION:
+               name = "lm95245";
+               break;
+       default:
+               return -ENODEV;
+       }
+
+       strlcpy(info->type, name, I2C_NAME_SIZE);
        return 0;
 }
 
@@ -484,7 +496,8 @@ static int lm95245_probe(struct i2c_client *client,
 
 /* Driver data (common to all clients) */
 static const struct i2c_device_id lm95245_id[] = {
-       { DEVNAME, 0 },
+       { "lm95235", 0 },
+       { "lm95245", 0 },
        { }
 };
 MODULE_DEVICE_TABLE(i2c, lm95245_id);
@@ -492,7 +505,7 @@ MODULE_DEVICE_TABLE(i2c, lm95245_id);
 static struct i2c_driver lm95245_driver = {
        .class          = I2C_CLASS_HWMON,
        .driver = {
-               .name   = DEVNAME,
+               .name   = "lm95245",
        },
        .probe          = lm95245_probe,
        .id_table       = lm95245_id,
@@ -503,5 +516,5 @@ static struct i2c_driver lm95245_driver = {
 module_i2c_driver(lm95245_driver);
 
 MODULE_AUTHOR("Alexander Stein <alexander.stein@systec-electronic.com>");
-MODULE_DESCRIPTION("LM95245 sensor driver");
+MODULE_DESCRIPTION("LM95235/LM95245 sensor driver");
 MODULE_LICENSE("GPL");