Changeset 2633

Timestamp:

07/04/04 21:12:18 (4 years ago)

Author:

khali

Message:

Add LM86, MAX6657 and MAX6658 support to the lm90 driver.

Files:

• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/lm90 (modified) (7 diffs)
• lm-sensors/trunk/etc/sensors.conf.eg (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/lm90.c (modified) (9 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (1 diff)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/doc/chips/SUMMARY

@@ -140 +140 @@
-        lm90            2       -       -       -       yes     no
-        lm99            2       -       -       -       yes     no
+        lm86            2       -       -       -       yes     no
-        adm1032         2       -       -       -       yes     no
+        max6657         2       -       -       -       yes     no
-        (lm89 is detected as an lm99)
-        lm89            2       -       -       -       yes     no
+        (max6658 is detected as a max6657)
+        max6658         2       -       -       -       yes     no
-
-lm92

lm-sensors/trunk/doc/chips/lm90

@@ -20 +20 @@
-    Datasheet: Publicly available at the National Semiconductor website
-               http://www.national.com/pf/LM/LM99.html
+  * National Semiconductor LM86
+    Prefix: `lm86'
+    Addresses scanned: I2C 0x4c
+    Datasheet: Publicly available at the National Semiconductor website
+               http://www.national.com/pf/LM/LM86.html
-  * Analog Devices ADM1032
-    Prefix: `adm1032'
@@ -25 +30 @@
-    Datasheet: Publicly available at the Analog Devices website
-               http://products.analog.com/products/info.asp?product=ADM1032
+  * Maxim MAX6657
+    Prefix: `max6657'
+    Addresses scanned: I2C 0x4c
+    Datasheet: Publicly available at the Maxim website
+               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578
+  * Maxim MAX6658
+    Prefix: `max6657'
+    Addresses scanned: I2C 0x4c
+    Datasheet: Publicly available at the Maxim website
+               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578
-
-
@@ -46 +61 @@
-  List of adapter,address pairs which are unquestionably assumed to contain
-  a `lm99' chip
+* force_lm86: short array (min = 1, max = 48)
+  List of adapter,address pairs which are unquestionably assumed to contain
+  a `lm86' chip
+* force_max6657: short array (min = 1, max = 48)
+  List of adapter,address pairs which are unquestionably assumed to contain
+  a `max6657' chip
-* probe: short array (min = 1, max = 48)
-  List of adapter,address pairs to scan additionally
@@ -62 +83 @@
-well as the temperature of up to one external diode. It is compatible
-with many other devices such as the LM86, the LM89, the LM99, the ADM1032,
-
-
+
-
-The specificity of this family of chipsets over the ADM1021/LM84
@@ -78 +98 @@
-  * ALERT is triggered by temperatures over critical limits.
-
-
+6 and LM8
-  * Same as LM90
-  * Better external channel accuracy
@@ -91 +111 @@
-  * Up to 64 conversions/s.
-  * ALERT is triggered by open remote sensor.
+
+MAX6657 and MAX6658:
+  * Remote sensor type selecion
-
-All temperature values are given in degrees Celcius. Resolution
@@ -111 +134 @@
--------------
-
- and 'lm99
+, 'lm99', 'lm86' and 'max6657
-
-LABEL                 LABEL CLASS           COMPUTE CLASS          MODE  MAGN

lm-sensors/trunk/etc/sensors.conf.eg

@@ -1734 +1734 @@
-
-
-
+ "lm86-*" "max6657-*"
-
-   label temp1 "M/B Temp"

lm-sensors/trunk/kernel/chips/lm90.c

@@ -22 +22 @@
- * Note that there is no way to differenciate between both chips.
- *
+ * This driver also supports the LM86, another sensor chip made by
+ * National Semiconductor. It is exactly similar to the LM90 except it
+ * has a higher accuracy.
+ * Complete datasheet can be obtained from National's website at:
+ *   http://www.national.com/pf/LM/LM86.html
+ *
- * This driver also supports the ADM1032, a sensor chip made by Analog
- * Devices. That chip is similar to the LM90, with a few differences
@@ -27 +33 @@
- * obtained from Analog's website at:
- *   http://products.analog.com/products/info.asp?product=ADM1032
+ * Among others, it has a higher accuracy than the LM90, much like the
+ * LM86 does.
+ *
+ * This driver also supports the MAX6657 and MAX6658, sensor chips made
+ * by Maxim. These chips are similar to the LM86. Complete datasheet
+ * can be obtained at Maxim's website at:
+ *   http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2578
+ * Note that there is no way to differenciate between both chips (but
+ * no need either).
- *
- * Since the LM90 was the first chipset supported by this driver, most
@@ -61 +76 @@
- * Addresses to scan
- * Address is fully defined internally and cannot be changed.
-9, LM90, LM99 and ADM1032
+6, LM89, LM90, LM99, ADM1032, MAX6657 and MAX6658
- * LM89-1, and LM99-1 have address 0x4d.
- */
@@ -74 +89 @@
- */
-
-3(lm90, adm1032, lm99
+5(lm90, adm1032, lm99, lm86, max6657
-
-/*
@@ -261 +276 @@
-        const char *type_name = "";
-        const char *client_name = "";
-        u8 reg_config1=0, reg_convrate=0;
-
-#ifdef DEBUG
@@ -310 +324 @@
-         */
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-                reg_config1 = i2c_smbus_read_byte_data(new_client,
-                        LM90_REG_R_CONFIG1);
-                reg_convrate = i2c_smbus_read_byte_data(new_client,
-                        LM90_REG_R_CONVRATE);
-
-                if ((reg_config1 & 0x2A) != 0x00
-                 || reg_convrate > 0x0A)
-                {
-#ifdef DEBUG
-                        printk(KERN_DEBUG "lm90.o: Detection failed at 0x%02x.\n",
-                                address);
-#endif
-                        goto ERROR1;
-                }
-        }
-
-        if (kind <= 0) /* identification */
-        {
-                u8 man_id, chip_id;
-
-                man_id = i2c_smbus_read_byte_data(new_client,
-                        LM90_REG_R_MAN_ID);
-                chip_id = i2c_smbus_read_byte_data(new_client,
-                        LM90_REG_R_CHIP_ID);
-                
-                if (man_id == 0x01) /* National Semiconductor */
@@ -344 +348 @@
-                                LM90_REG_R_CONFIG2);
-
-kind == 0 /* skip detection */
-|| (
- && reg_convrate <= 0x09)
+(reg_config1 & 0x2A) == 0x00
+&& 
+&& reg_convrate <= 0x09
-                        {
-                                if (address == 0x4C
-                                 && (chip_id & 0xF0) == 0x20) /* LM90 */
-                                {
-                                        kind = lm90;
-                                }
-                                else if ((chip_id & 0xF0) == 0x30) /* LM89/LM99 */
-                                {
-                                        kind = lm99;
-
+
+
+
-                        }
-                }
@@ -363 +366 @@
-                        if (address == 0x4C
-                         && (chip_id & 0xF0) == 0x40 /* ADM1032 */
-
-
-
+
+
-                                kind = adm1032;
-
+
+
+
+
+
+
+
-                }
-        }
@@ -391 +399 @@
-                type_name = "lm99";
-                client_name = "LM99 chip";
+        }
+        else if (kind == lm86)
+        {
+                type_name = "lm86";
+                client_name = "LM86 chip";
+        }
+        else if (kind == max6657)
+        {
+                type_name = "max6657";
+                client_name = "MAX6657 chip";
-        }
-        else

lm-sensors/trunk/lib/chips.c

@@ -5215 +5215 @@
- { SENSORS_ADM1032_PREFIX, lm90_features },
- { SENSORS_LM99_PREFIX, lm90_features },
+ { SENSORS_LM86_PREFIX, lm90_features },
+ { SENSORS_MAX6657_PREFIX, lm90_features },
- { SENSORS_MAX1619_PREFIX, max1619_features },
- { SENSORS_XEONTEMP_PREFIX, xeontemp_features },

lm-sensors/trunk/lib/chips.h

@@ -476 +476 @@
-#define SENSORS_LM85_ZONE3_SMOOTH          101  /* RW -- zone3_smooth  */
-
-9/LM90/LM99/ADM1032
+6/LM89/LM90/LM99/ADM1032/MAX6657
-
-#define SENSORS_LM90_PREFIX "lm90"
-#define SENSORS_ADM1032_PREFIX "adm1032"
-#define SENSORS_LM99_PREFIX "lm99"
+#define SENSORS_LM86_PREFIX "lm86"
+#define SENSORS_MAX6657_PREFIX "max6657"
-
-#define SENSORS_LM90_LOCAL_TEMP 51 /* R */

lm-sensors/trunk/prog/detect/sensors-detect

@@ -1219 +1219 @@
-     {
-       name => "Maxim MAX6657/MAX6658/MAX6659",
-to-be-written
+lm90
-       i2c_addrs => [0x4c],
-       i2c_detect => sub { lm90_detect 4, @_ },

lm-sensors/trunk/prog/sensors/main.c

@@ -425 +425 @@
-        { "adm1032", print_lm90 },
-        { "lm99", print_lm90 },
+        { "lm86", print_lm90 },
+        { "max6657", print_lm90 },
-        { "xeontemp", print_xeontemp },
-        { "max6650", print_max6650 },