Changeset 935

Timestamp:

11/27/00 00:07:17 (8 years ago)

Author:

mds

Message:

(mds) add ds1621 driver from Christian Zuckschwerdt (zany@triq.net)

Files:

• lm-sensors/trunk/CHANGES (modified) (2 diffs)
• lm-sensors/trunk/README (modified) (1 diff)
• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/ds1621 (added)
• lm-sensors/trunk/kernel/chips/Module.mk (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/ds1621.c (added)
• lm-sensors/trunk/kernel/include/sensors.h (modified) (2 diffs)
• lm-sensors/trunk/kernel/sensors.c (modified) (2 diffs)
• 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

@@ -21 +21 @@
-  Chip modules (all): Update mutex definition (works now for new 2.2 kernels)
-  File sensors.conf.eg: Add mtp008 entries
-
+ds1621, 
-  Module adm1021: Add support for adm1021a / adm1023
+  Module ddcmon: allow force and force_ddcmon parameters
+  Module ds1621: new
-  Module i2c-ali1535: Enhance error checking and recovery; add mutex
-  Module ddcmon: allow force and force_ddcmon parameters
-  Module lm87: update voltage calculations
-  Module mtp008: new
@@ -30 +31 @@
-  Module w83781d: fix beep setting via /proc
-  Program mkpatch.pl: more fixes
-
-
+ds1621, 
+ds1621, 
-
-2.5.4 (20001012)

lm-sensors/trunk/README

@@ -52 +52 @@
-                 ADM1023, ADM1025, and ADM9240
-  Asus AS99127F
-1780, DS75, and DS1775
+75, DS1621, DS1775, and DS1780
-  Hewlett Packard Maxilife (several revisions including '99 NBA)
-  Genesys Logic GL518SM (rev 00, 80), GL520SM, GL523SM

lm-sensors/trunk/doc/chips/SUMMARY

@@ -56 +56 @@
-        ds1780          1       6       2       1 dac   yes     no
-        lm81            1       6       2       1 dac   yes     no
+
+ds1621
+        ds1621          1       -       -       -       yes     no
-
-gl518sm

lm-sensors/trunk/kernel/chips/Module.mk

@@ -37 +37 @@
-ifneq ($(shell if grep -q '^CONFIG_SENSORS_ADM9240=y' $(LINUX)/.config; then echo 1; fi),1)
-KERNELCHIPSTARGETS += $(MODULE_DIR)/adm9240.o
+endif
+ifneq ($(shell if grep -q '^CONFIG_SENSORS_DS1621=y' $(LINUX)/.config; then echo 1; fi),1)
+KERNELCHIPSTARGETS += $(MODULE_DIR)/ds1621.o
-endif
-ifneq ($(shell if grep -q '^CONFIG_SENSORS_EEPROM=y' $(LINUX)/.config; then echo 1; fi),1)

lm-sensors/trunk/kernel/include/sensors.h

@@ -403 +403 @@
-#define I2C_DRIVERID_PCF8574 1022
-#define I2C_DRIVERID_MTP008 1023
+#define I2C_DRIVERID_DS1621 1024
-
-/* Sysctl IDs */
@@ -816 +817 @@
-#define MTP008_ALARM_TEMP3      0x0200
-
+#define DS1621_SYSCTL_TEMP 1200 /* Degrees Celcius * 10 */
+#define DS1621_SYSCTL_ALARMS 2001       /* bitvector */
+#define DS1621_ALARM_TEMP_HIGH 0x40
+#define DS1621_ALARM_TEMP_LOW 0x20
+#define DS1621_SYSCTL_ENABLE 2002
+
-#endif                          /* def SENSORS_SENSORS_H */
-

lm-sensors/trunk/kernel/sensors.c

@@ -923 +923 @@
-extern int sensors_adm9024_init(void);
-#endif
+#ifdef CONFIG_SENSORS_DS1621
+extern int sensors_ds1621_init(void);
+#endif
-#ifdef CONFIG_SENSORS_GL518SM
-extern int sensors_gl518sm_init(void);
@@ -957 +960 @@
-        sensors_adm9024_init();
-#endif
+#ifdef CONFIG_SENSORS_DS1621
+        sensors_ds1621_init();
+#endif
-#ifdef CONFIG_SENSORS_GL518SM
-        sensors_gl518sm_init();

lm-sensors/trunk/lib/chips.c

@@ -1973 +1973 @@
-  };
-
+static sensors_chip_feature ds1621_features[] =
+  {
+    { SENSORS_DS1621_TEMP, "temp", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, DS1621_SYSCTL_TEMP, VALUE(3), 1 },
+    { SENSORS_DS1621_TEMP_HYST, "temp_hyst", SENSORS_DS1621_TEMP,
+                              SENSORS_DS1621_TEMP, SENSORS_MODE_RW, 
+                              DS1621_SYSCTL_TEMP, VALUE(2), 1 },
+    { SENSORS_DS1621_TEMP_OVER, "temp_over", SENSORS_DS1621_TEMP,
+                              SENSORS_DS1621_TEMP, SENSORS_MODE_RW, 
+                              DS1621_SYSCTL_TEMP, VALUE(1), 1 },
+    { SENSORS_DS1621_ALARMS, "alarms", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                           SENSORS_MODE_R, DS1621_SYSCTL_ALARMS, VALUE(1), 0 },
+    { 0 }
+  };
+
-sensors_chip_features sensors_chip_features_list[] =
-{
@@ -2015 +2030 @@
- { SENSORS_LM87_PREFIX, lm87_features },
- { SENSORS_MTP008_PREFIX, mtp008_features },
+ { SENSORS_DS1621_PREFIX, ds1621_features },
- { 0 }
-};

lm-sensors/trunk/lib/chips.h

@@ -902 +902 @@
-#define SENSORS_MTP008_BEEP            82 /* RW */
-
+/* DS1621 chips. */
+
+#define SENSORS_DS1621_PREFIX "ds1621"
+
+#define SENSORS_DS1621_TEMP 51 /* R */
+#define SENSORS_DS1621_TEMP_HYST 52 /* RW */
+#define SENSORS_DS1621_TEMP_OVER 53 /* RW */
+#define SENSORS_DS1621_ALARMS 81 /* R */
+
-#endif /* def LIB_SENSORS_CHIPS_H */

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

@@ -361 +361 @@
-            via686a_isa_detect adm1022_detect ltc1710_detect gl525sm_detect
-            lm87_detect ite_detect ite_isa_detect ite_alias_detect
-
+ ds1621_detect
-
-# This is a list of all recognized chips. 
@@ -521 +521 @@
-       i2c_detect => sub { adm9240_detect 0, @_ }
-     },
+     {
+       name => "Dallas Semiconductor DS1621",
+       driver => "ds1621",
+       i2c_addrs => [0x48..0x4f],
+       i2c_detect => sub { ds1621_detect @_},
+     } ,
-     {
-       name => "Dallas Semiconductor DS1780",
@@ -1567 +1573 @@
-}
-  
+# $_[0]: A reference to the file descriptor to access this chip.
+#        We may assume an i2c_set_slave_addr was already done.
+# $_[1]: Address
+# Returns: undef if not detected, (3) if detected,
+#   (6) or (9) if even more bits match. 
+# Registers used:
+#   0xAC: Configuration
+# Detection is weak. We check if Bit 3 is set and Bit 2 is clear.
+# The DS1621 will aways have a config like 0x????10??. A even better
+# match would be 0x0??01000.
+sub ds1621_detect
+{
+  my $i;
+  my ($file,$addr) = @_;
+  my $conf = i2c_smbus_read_byte_data($file,0xAC);
+  return (9) if ($conf & 0x9F) == 0x98;
+  return (6) if ($conf & 0x0F) == 0x08;
+  return (3) if ($conf & 0x0C) == 0x08;
+  return ;
+}
-
-# $_[0]: A reference to the file descriptor to access this chip.

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

@@ -104 +104 @@
-  }
-  return err;
+}
+
+void print_ds1621(const sensors_chip_name *name)
+{
+  char *label;
+  double cur,hyst,over;
+  int alarms, valid;
+
+  if (!sensors_get_feature(*name,SENSORS_LM78_ALARMS,&cur)) 
+    alarms = cur + 0.5;
+  else {
+    printf("ERROR: Can't get alarm data!\n");
+    alarms = 0;
+  }
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_DS1621_TEMP,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_DS1621_TEMP,&cur) &&
+      !sensors_get_feature(*name,SENSORS_DS1621_TEMP_HYST,&hyst) &&
+      !sensors_get_feature(*name,SENSORS_DS1621_TEMP_OVER,&over))  {
+    if (valid) {
+      print_label(label,10);
+      printf("%6.1f C (high limit: %6.1f C, low limit: %6.1f C)   ",
+             cur,over,hyst);
+      if (alarms & (DS1621_ALARM_TEMP_HIGH | DS1621_ALARM_TEMP_LOW)) {
+        printf("ALARM (");
+        if (alarms & DS1621_ALARM_TEMP_LOW) {
+          printf("LOW");
+        }
+        if (alarms & DS1621_ALARM_TEMP_HIGH)
+          printf("%sHIGH",(alarms & DS1621_ALARM_TEMP_LOW)?",":"");
+        printf(")");
+      }
+      printf("\n");
+    }
+  } else
+    printf("ERROR: Can't get temperature data!\n");
+  free_the_label(&label);
-}
-

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

@@ -25 +25 @@
-extern void print_unknown_chip(const sensors_chip_name *name);
-
+extern void print_ds1621(const sensors_chip_name *name);
-extern void print_mtp008(const sensors_chip_name *name);
-extern void print_lm75(const sensors_chip_name *name);

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

@@ -261 +261 @@
-  if (do_unknown)
-    print_unknown_chip(&name);
+  else if (!strcmp(name.prefix,"ds1621"))
+    print_ds1621(&name);
-  else if (!strcmp(name.prefix,"lm75"))
-    print_lm75(&name);