patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / i2c / chips / lm90.c

diff --git a/drivers/i2c/chips/lm90.c b/drivers/i2c/chips/lm90.c
index 111781a..f28b667 100644 (file)
--- a/drivers/i2c/chips/lm90.c
+++ b/drivers/i2c/chips/lm90.c
@@ -1,7 +1,7 @@
 /*
  * lm90.c - Part of lm_sensors, Linux kernel modules for hardware
  *          monitoring
- * Copyright (C) 2003  Jean Delvare <khali@linux-fr.org>
+ * Copyright (C) 2003-2004  Jean Delvare <khali@linux-fr.org>
  *
  * Based on the lm83 driver. The LM90 is a sensor chip made by National
  * Semiconductor. It reports up to two temperatures (its own plus up to
@@ -10,6 +10,17 @@
  * obtained from National's website at:
  *   http://www.national.com/pf/LM/LM90.html
  *
+ * This driver also supports the LM89 and LM99, two other sensor chips
+ * made by National Semiconductor. Both have an increased remote
+ * temperature measurement accuracy (1 degree), and the LM99
+ * additionally shifts remote temperatures (measured and limits) by 16
+ * degrees, which allows for higher temperatures measurement. The
+ * driver doesn't handle it since it can be done easily in user-space.
+ * Complete datasheets can be obtained from National's website at:
+ *   http://www.national.com/pf/LM/LM89.html
+ *   http://www.national.com/pf/LM/LM99.html
+ * Note that there is no way to differenciate between both chips.
+ *
  * This driver also supports the ADM1032, a sensor chip made by Analog
  * Devices. That chip is similar to the LM90, with a few differences
  * that are not handled by this driver. Complete datasheet can be
@@ -45,9 +56,11 @@
 /*
  * Addresses to scan
  * Address is fully defined internally and cannot be changed.
+ * LM89, LM90, LM99 and ADM1032 have address 0x4c.
+ * LM89-1, and LM99-1 have address 0x4d.
  */
 
-static unsigned short normal_i2c[] = { 0x4c, I2C_CLIENT_END };
+static unsigned short normal_i2c[] = { 0x4c, 0x4d, I2C_CLIENT_END };
 static unsigned short normal_i2c_range[] = { I2C_CLIENT_END };
 static unsigned int normal_isa[] = { I2C_CLIENT_ISA_END };
 static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END };
@@ -56,7 +69,7 @@ static unsigned int normal_isa_range[] = { I2C_CLIENT_ISA_END };
  * Insmod parameters
  */
 
-SENSORS_INSMOD_2(lm90, adm1032);
+SENSORS_INSMOD_3(lm90, adm1032, lm99);
 
 /*
  * The LM90 registers
@@ -261,7 +274,7 @@ static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
 
 static int lm90_attach_adapter(struct i2c_adapter *adapter)
 {
-       if (!(adapter->class & I2C_ADAP_CLASS_SMBUS))
+       if (!(adapter->class & I2C_CLASS_HWMON))
                return 0;
        return i2c_detect(adapter, &addr_data, lm90_detect);
 }
@@ -330,16 +343,26 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
                          LM90_REG_R_CHIP_ID);
                
                if (man_id == 0x01) { /* National Semiconductor */
-                       if (chip_id >= 0x21 && chip_id < 0x30 /* LM90 */
-                        && (kind == 0 /* skip detection */
-                         || ((i2c_smbus_read_byte_data(new_client,
-                               LM90_REG_R_CONFIG2) & 0xF8) == 0x00
-                          && reg_convrate <= 0x09))) {
-                               kind = lm90;
+                       u8 reg_config2;
+
+                       reg_config2 = i2c_smbus_read_byte_data(new_client,
+                                     LM90_REG_R_CONFIG2);
+
+                       if (kind == 0 /* skip detection */
+                        || ((reg_config2 & 0xF8) == 0x00
+                         && reg_convrate <= 0x09)) {
+                               if (address == 0x4C
+                                && (chip_id & 0xF0) == 0x20) { /* LM90 */
+                                       kind = lm90;
+                               } else
+                               if ((chip_id & 0xF0) == 0x30) { /* LM89/LM99 */
+                                       kind = lm99;
+                               }
                        }
-               }
-               else if (man_id == 0x41) { /* Analog Devices */
-                       if ((chip_id & 0xF0) == 0x40 /* ADM1032 */
+               } else
+               if (man_id == 0x41) { /* Analog Devices */
+                       if (address == 0x4C
+                        && (chip_id & 0xF0) == 0x40 /* ADM1032 */
                         && (kind == 0 /* skip detection */
                          || (reg_config1 & 0x3F) == 0x00)) {
                                kind = adm1032;
@@ -358,6 +381,8 @@ static int lm90_detect(struct i2c_adapter *adapter, int address, int kind)
                name = "lm90";
        } else if (kind == adm1032) {
                name = "adm1032";
+       } else if (kind == lm99) {
+               name = "lm99";
        }
 
        /* We can fill in the remaining client fields */