Changeset 4574

Timestamp:

07/07/07 10:09:38 (1 year ago)

Author:

khali

Message:

Add support for the EMC6D102 extra resolution bits. The chip offers
4 extra resolution bits per voltage and temperature channel, but I
chose to use only 2 bits per channel because that's what the ADM1027
has so it made the changes smaller. The EMC6D102 has a 10-bit ADC
anyway, the 2 remaining bits are obtained from averaging so they are
not so important.

Files:

• lm-sensors/trunk/CHANGES (modified) (2 diffs)
• lm-sensors/trunk/kernel/chips/lm85.c (modified) (2 diffs)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (10 diffs)

lm-sensors/trunk/CHANGES

@@ -17 +17 @@
-  Module i2c-nforce2: Add nForce MCP61, MCP65 support (2.6 backport)
-  Module lm85: Fix setting the fan speed min limit to 0
+               Add support for the EMC6D102 extra resolution bits
-  Module thmc50: Fix the i2c address range
-  Module w83627ehf: New (2.6 backport)
@@ -44 +45 @@
-                   Add support for the w83627ehf thermal sensor types
-                   Add support for it87 fan4 and fan5
+                   Display the extra resolution bits of the emc6d102
-  Program sensors-detect: Stop Super-I/O probe after first family success
-                          Fix SMSC DME1737 detection

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

@@ -165 +165 @@
-#define EMC6D100_REG_IN_MIN(nr) (0x73 + ((nr)-5) * 2)
-#define EMC6D100_REG_IN_MAX(nr) (0x74 + ((nr)-5) * 2)
+
+#define EMC6D102_REG_EXTEND_ADC1 0x85
+#define EMC6D102_REG_EXTEND_ADC2 0x86
+#define EMC6D102_REG_EXTEND_ADC3 0x87
+#define EMC6D102_REG_EXTEND_ADC4 0x88
-
-/* Conversions. Rounding and limit checking is only done on the TO_REG 
@@ -1163 +1168 @@
-
-                        break ;
+                case emc6d102 :
+                        /* Have to read LSB bits after the MSB ones because
+                           the reading of the MSB bits has frozen the
+                           LSBs (backward from the ADM1027).
+                           We use only two extra bits per channel, and encode
+                           them in the same format the ADM1027 uses, to keep the
+                           rest of the code unchanged.
+                         */
+                        i = lm85_read_value(client, EMC6D102_REG_EXTEND_ADC1);
+                        data->extend_adc = (i & 0xcc) << 8; /* temp3, temp1 */
+                        i = lm85_read_value(client, EMC6D102_REG_EXTEND_ADC2);
+                        data->extend_adc |= (i & 0x0c) << 10; /* temp2 */
+                        data->extend_adc |= (i & 0xc0) << 2; /* in4 */
+                        i = lm85_read_value(client, EMC6D102_REG_EXTEND_ADC3);
+                        data->extend_adc |= (i & 0x0c) >> 2; /* in0 */
+                        data->extend_adc |= i & 0xc0; /* in3 */
+                        i = lm85_read_value(client, EMC6D102_REG_EXTEND_ADC4);
+                        data->extend_adc |= i & 0x0c; /* in1 */
+                        data->extend_adc |= (i & 0xc0) >> 2; /* in2 */
+                        break;
-                default : break ; /* no warnings */
-                }

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

@@ -1559 +1559 @@
-  double cur, min, max;
-  int alarms, alarm_mask = 0, valid;
-
+, xadc
-
-  is1027 = !strcmp(name->prefix,"adm1027")
@@ -1565 +1565 @@
-  is7463 = !strcmp(name->prefix, "adt7463");
-  is6d100 = !strcmp(name->prefix,"emc6d100") ;
+  xadc = is1027 || !strcmp(name->prefix, "emc6d102");
-
-  if (!sensors_get_feature(*name,SENSORS_LM85_ALARMS,&cur)) 
@@ -1585 +1586 @@
-      print_label(label,10);
-      printf("%+7.*f V  (min = %+6.2f V, max = %+6.2f V)   %s",
-is1027
+xadc
-      if (is1027) { printf(alarm_mask&LM85_ALARM_IN0?" MASKED":""); }
-      putchar( '\n' );
@@ -1599 +1600 @@
-      print_label(label,10);
-      printf("%+7.*f V  (min = %+6.2f V, max = %+6.2f V)   %s",
-is1027
+xadc
-      if (is1027) { printf(alarm_mask&LM85_ALARM_IN1?" MASKED":""); }
-      putchar( '\n' );
@@ -1613 +1614 @@
-      print_label(label,10);
-      printf("%+7.*f V  (min = %+6.2f V, max = %+6.2f V)   %s",
-is1027
+xadc
-      if (is1027) { printf(alarm_mask&LM85_ALARM_IN2?" MASKED":""); }
-      putchar( '\n' );
@@ -1627 +1628 @@
-      print_label(label,10);
-      printf("%+7.*f V  (min = %+6.2f V, max = %+6.2f V)   %s",
-is1027
+xadc
-      if (is1027) { printf(alarm_mask&LM85_ALARM_IN3?" MASKED":""); }
-      putchar( '\n' );
@@ -1641 +1642 @@
-      print_label(label,10);
-      printf("%+7.*f V  (min = %+6.2f V, max = %+6.2f V)   %s",
-is1027
+xadc
-      if (is1027) { printf(alarm_mask&LM85_ALARM_IN4?" MASKED":""); }
-      putchar( '\n' );
@@ -1747 +1748 @@
-    if (valid) {
-      print_label(label,10);
-is1027
+xadc
-      printf( "   %s %s %s\n",
-                 alarms&LM85_ALARM_TEMP1?"ALARM":"",
@@ -1763 +1764 @@
-    if (valid) {
-      print_label(label,10);
-is1027
+xadc
-      printf( "   %s %s\n",
-                 alarms&LM85_ALARM_TEMP2?"ALARM":"",
@@ -1778 +1779 @@
-    if (valid) {
-      print_label(label,10);
-is1027
+xadc
-      printf( "   %s %s %s\n",
-                 alarms&LM85_ALARM_TEMP3?"ALARM":"",