hwmon: (lm70) Add support for LM71 and LM74

Add support for LM74 and LM71 to LM70 driver.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/Documentation/hwmon/lm70 b/Documentation/hwmon/lm70
index 1bb1f20951cab60f7b3853111e10908c0dcf1ba4..86d182942c51498524429f34e7ed979b68dc75b3 100644 (file)
--- a/Documentation/hwmon/lm70
+++ b/Documentation/hwmon/lm70
@@ -6,6 +6,10 @@ Supported chips:
     Datasheet: http://www.national.com/pf/LM/LM70.html
   * Texas Instruments TMP121/TMP123
     Information: http://focus.ti.com/docs/prod/folders/print/tmp121.html
+  * National Semiconductor LM71
+    Datasheet: http://www.ti.com/product/LM71
+  * National Semiconductor LM74
+    Datasheet: http://www.ti.com/product/LM74
 
 Author:
         Kaiwan N Billimoria <kaiwan@designergraphix.com>
@@ -31,8 +35,11 @@ As a real (in-tree) example of this "SPI protocol driver" interfacing
 with a "SPI master controller driver", see drivers/spi/spi_lm70llp.c
 and its associated documentation.
 
-The TMP121/TMP123 are very similar; main difference is 13-bit temperature
-data (0.0625 degrees celsius resolution).
+The LM74 and TMP121/TMP123 are very similar; main difference is 13-bit
+temperature data (0.0625 degrees celsius resolution).
+
+The LM71 is also very similar; main difference is 14-bit temperature
+data (0.03125 degrees celsius resolution).
 
 Thanks to
 ---------

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 6566ed6db3b044d692657be69cf932b68dd1a6ad..8343cadd66325f8e06499f548b9af7048842676b 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -560,12 +560,12 @@ config SENSORS_LM63
          will be called lm63.
 
 config SENSORS_LM70
-       tristate "National Semiconductor LM70 / Texas Instruments TMP121"
+       tristate "National Semiconductor LM70 and compatibles"
        depends on SPI_MASTER
        help
          If you say yes here you get support for the National Semiconductor
-         LM70 and Texas Instruments TMP121/TMP123 digital temperature
-         sensor chips.
+         LM70, LM71, LM74 and Texas Instruments TMP121/TMP123 digital tempera-
+         ture sensor chips.
 
          This driver can also be built as a module.  If so, the module
          will be called lm70.

diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c
index 1da62f616db5964fd064f898b1a02d0d0083fab8..789753d0df79a55d13ec9668d38c2f13f2252521 100644 (file)
--- a/drivers/hwmon/lm70.c
+++ b/drivers/hwmon/lm70.c
@@ -43,6 +43,8 @@
 
 #define LM70_CHIP_LM70         0       /* original NS LM70 */
 #define LM70_CHIP_TMP121       1       /* TI TMP121/TMP123 */
+#define LM70_CHIP_LM71         2       /* NS LM71 */
+#define LM70_CHIP_LM74         3       /* NS LM74 */
 
 struct lm70 {
        struct device *hwmon_dev;
@@ -88,9 +90,13 @@ static ssize_t lm70_sense_temp(struct device *dev,
         * Celsius.
         * So it's equivalent to multiplying by 0.25 * 1000 = 250.
         *
-        * TMP121/TMP123:
+        * LM74 and TMP121/TMP123:
         * 13 bits of 2's complement data, discard LSB 3 bits,
         * resolution 0.0625 degrees celsius.
+        *
+        * LM71:
+        * 14 bits of 2's complement data, discard LSB 2 bits,
+        * resolution 0.0312 degrees celsius.
         */
        switch (p_lm70->chip) {
        case LM70_CHIP_LM70:
@@ -98,8 +104,13 @@ static ssize_t lm70_sense_temp(struct device *dev,
                break;
 
        case LM70_CHIP_TMP121:
+       case LM70_CHIP_LM74:
                val = ((int)raw / 8) * 625 / 10;
                break;
+
+       case LM70_CHIP_LM71:
+               val = ((int)raw / 4) * 3125 / 100;
+               break;
        }
 
        status = sprintf(buf, "%d\n", val); /* millidegrees Celsius */
@@ -123,6 +134,12 @@ static ssize_t lm70_show_name(struct device *dev, struct device_attribute
        case LM70_CHIP_TMP121:
                ret = sprintf(buf, "tmp121\n");
                break;
+       case LM70_CHIP_LM71:
+               ret = sprintf(buf, "lm71\n");
+               break;
+       case LM70_CHIP_LM74:
+               ret = sprintf(buf, "lm74\n");
+               break;
        default:
                ret = -EINVAL;
        }
@@ -139,7 +156,7 @@ static int __devinit lm70_probe(struct spi_device *spi)
        struct lm70 *p_lm70;
        int status;
 
-       /* signaling is SPI_MODE_0 for both LM70 and TMP121 */
+       /* signaling is SPI_MODE_0 */
        if (spi->mode & (SPI_CPOL | SPI_CPHA))
                return -EINVAL;
 
@@ -196,6 +213,8 @@ static int __devexit lm70_remove(struct spi_device *spi)
 static const struct spi_device_id lm70_ids[] = {
        { "lm70",   LM70_CHIP_LM70 },
        { "tmp121", LM70_CHIP_TMP121 },
+       { "lm71",   LM70_CHIP_LM71 },
+       { "lm74",   LM70_CHIP_LM74 },
        { },
 };
 MODULE_DEVICE_TABLE(spi, lm70_ids);
@@ -213,5 +232,5 @@ static struct spi_driver lm70_driver = {
 module_spi_driver(lm70_driver);
 
 MODULE_AUTHOR("Kaiwan N Billimoria");
-MODULE_DESCRIPTION("NS LM70 / TI TMP121/TMP123 Linux driver");
+MODULE_DESCRIPTION("NS LM70 and compatibles Linux driver");
 MODULE_LICENSE("GPL");