Changeset 1987

Timestamp:

08/31/03 22:45:12 (5 years ago)

Author:

jrm

Message:

(jrm): New driver and other support for the Maxim MAX6650 and MAX6651 chips.

Mainly targetted (and tested) with the 6651, but should work with
the MAX6550.

See doc/chips/max6650 for notes, bugs, assumptions, etc.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/CONTRIBUTORS (modified) (1 diff)
• lm-sensors/trunk/README (modified) (1 diff)
• lm-sensors/trunk/doc/chips/max6650 (added)
• lm-sensors/trunk/kernel/chips/max6650.c (added)
• lm-sensors/trunk/lib/chips.c (modified) (2 diffs)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (3 diffs)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -59 +59 @@
-  Module lm83: Add t_crit and alarms support
-  Module lm90: New
+  Module max6650: New
-  Module saa1064: New
-  Module w83781d: Enhance chip detection

lm-sensors/trunk/CONTRIBUTORS

@@ -91 +91 @@
-* Sascha Volkenandt <sascha@akv-soft.de>
-  Author of the SAA1064 chip driver.
+* John Morris (john.morris@spirentcom.com)
+  Author of the MAX6650 chip driver.
+  

lm-sensors/trunk/README

@@ -78 +78 @@
-  Intel Xeon processor embedded sensors
-  ITE IT8705F, IT8712F embedded sensors
- and MAX1617A
+, MAX1617A, MAX6650 and MAX6651
-  Microchip TC1068, TCM1617, TCN75
-  Myson MTP008

lm-sensors/trunk/lib/chips.c

@@ -4444 +4444 @@
-  };
-
+static sensors_chip_feature max6650_features[] =
+  {
+    { SENSORS_MAX6650_FAN1_TACH, "fan1", SENSORS_NO_MAPPING,
+                                 SENSORS_NO_MAPPING, SENSORS_MODE_R,
+                                 MAX6650_SYSCTL_FAN1, VALUE(1), 0 },
+    { SENSORS_MAX6650_FAN2_TACH, "fan2", SENSORS_NO_MAPPING,
+                                 SENSORS_NO_MAPPING, SENSORS_MODE_R,
+                                 MAX6650_SYSCTL_FAN2, VALUE(1), 0 },
+    { SENSORS_MAX6650_FAN3_TACH, "fan3", SENSORS_NO_MAPPING,
+                                 SENSORS_NO_MAPPING, SENSORS_MODE_R,
+                                 MAX6650_SYSCTL_FAN3, VALUE(1), 0 },
+    { SENSORS_MAX6650_FAN4_TACH, "fan4", SENSORS_NO_MAPPING,
+                                 SENSORS_NO_MAPPING, SENSORS_MODE_R,
+                                 MAX6650_SYSCTL_FAN4, VALUE(1), 0 },
+    { SENSORS_MAX6650_SPEED, "speed", SENSORS_NO_MAPPING,
+                                 SENSORS_NO_MAPPING, SENSORS_MODE_RW,
+                                 MAX6650_SYSCTL_SPEED, VALUE(1), 0 },
+  };
+
-sensors_chip_features sensors_chip_features_list[] =
-{
@@ -4512 +4531 @@
- { SENSORS_LM90_PREFIX, lm90_features },
- { SENSORS_XEONTEMP_PREFIX, xeontemp_features },
+ { SENSORS_MAX6650_PREFIX, max6650_features },
- { 0 }
-};

lm-sensors/trunk/lib/chips.h

@@ -1656 +1656 @@
-#define SENSORS_XEONTEMP_ALARMS 81 /* R */
-
+/* MAX6650 / 1 chips */
+
+#define SENSORS_MAX6650_PREFIX "max6650"
+
+#define SENSORS_MAX6650_FAN1_TACH  1 /* R */
+#define SENSORS_MAX6650_FAN2_TACH  2 /* R */
+#define SENSORS_MAX6650_FAN3_TACH  3 /* R */
+#define SENSORS_MAX6650_FAN4_TACH  4 /* R */
+#define SENSORS_MAX6650_SPEED      5 /* RW */
+
-#endif /* def LIB_SENSORS_CHIPS_H */

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

@@ -777 +777 @@
-            ipmi_smic_detect via8231_isa_detect lm85_detect smartbatt_detect
-            adm1026_detect w83l785ts_detect lm83_detect lm90_detect
-
+ max6650_detect
-
-# This is a list of all recognized chips. 
@@ -1060 +1060 @@
-       i2c_addrs => [0x18..0x1a,0x29..0x2b,0x4c..0x4e],
-       i2c_detect => sub { adm1021_detect 3, @_ },
+     },
+     {
+       name => "Maxim MAX6650/MAX6651",
+       driver => "max6650",
+       i2c_addrs => [0x1b,0x1f,0x48,0x4b],
+       i2c_detect => sub { max6650_detect 0, @_ },
-     },
-     {
@@ -3401 +3407 @@
-}
-
+# $_[0]: Chip to detect. Always zero for now, but available for future use
+#        if somebody finds a way to distinguish MAX6650 and MAX6651.
+# $_[1]: A reference to the file descriptor to access this chip.
+#        We may assume an i2c_set_slave_addr was already done.
+# $_[2]: Address
+# Returns: undef if not detected, 4 if detected.
+#
+# The max6650 has no device ID register. However, a few registers have
+# spare bits, which are documented as being always zero on read. We read
+# all of these registers check the spare bits. Any non-zero means this
+# is not a max6650/1.
+#
+# The always zero bits are: 
+#   configuration byte register (0x02) - top 2 bits 
+#   gpio status register (0x14) - top 3 bits
+#   alarm enable register (0x08) - top 3 bits
+#   alarm status register (0x0A) - top 3 bits
+#   tachometer count time register (0x16) - top 6 bits
+sub max6650_detect
+{
+  my ($chip, $file) = @_;
+  return if i2c_smbus_read_byte_data($file,0x16) & 0xFC;
+  return if i2c_smbus_read_byte_data($file,0x0A) & 0xE0;
+  return if i2c_smbus_read_byte_data($file,0x08) & 0xE0;
+  return if i2c_smbus_read_byte_data($file,0x14) & 0xE0;
+  return if i2c_smbus_read_byte_data($file,0x02) & 0xC0;
+  return 4;
+}
-
-

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

@@ -4512 +4512 @@
-}
-
+void print_max6650(const sensors_chip_name *name)
+{
+  char *label = NULL;
+  double tach, speed;
+  int valid, i;
+
+  static const struct
+  {
+    int tag;
+    char *name;
+  }
+  tach_list[] =
+  {
+    { SENSORS_MAX6650_FAN1_TACH, "FAN1" },
+    { SENSORS_MAX6650_FAN2_TACH, "FAN2" },
+    { SENSORS_MAX6650_FAN3_TACH, "FAN3" },
+    { SENSORS_MAX6650_FAN4_TACH, "FAN4" }
+  };
+
+  /* Display full config for fan1, which is controlled */
+
+  if (!sensors_get_label_and_valid(*name,tach_list[0].tag,&label,&valid) &&
+      !sensors_get_feature(*name,tach_list[0].tag,&tach) &&
+      !sensors_get_feature(*name,SENSORS_MAX6650_SPEED,&speed)) {
+    if (valid) {
+      print_label(label,10);
+      printf("configured %4.0f RPM, actual %4.0f RPM.\n", speed, tach);
+    }
+  } else
+    printf("ERROR: Can't get %s data!\n", tach_list[i].name);
+  free_the_label(&label);
+  
+  /* Just display the measured speed for the other three, uncontrolled fans */
+  
+  for (i = 1; i < 4; i++)
+  {
+    if (!sensors_get_label_and_valid(*name,tach_list[i].tag,&label,&valid) &&
+        !sensors_get_feature(*name,tach_list[i].tag,&tach)) {
+      if (valid) {
+        print_label(label,10);
+        printf("%4.0f RPM  \n", tach);
+      }
+    } else
+      printf("ERROR: Can't get %s data!\n", tach_list[i].name);
+ 
+    free_the_label(&label);
+  }
+}
+
-void print_unknown_chip(const sensors_chip_name *name)
-{

lm-sensors/trunk/prog/sensors/chips.h

@@ -56 +56 @@
-extern void print_lm90(const sensors_chip_name *name);
-extern void print_xeontemp(const sensors_chip_name *name);
+extern void print_max6650(const sensors_chip_name *name);
-
-#endif /* def PROG_SENSORS_CHIPS_H */

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

@@ -381 +381 @@
-  else if (!strcmp(name.prefix,"xeontemp"))
-    print_xeontemp(&name);
+  else if (!strcmp(name.prefix,"max6650"))
+    print_max6650(&name);
-  else
-    print_unknown_chip(&name);