Changeset 940

Timestamp:

11/30/00 03:44:47 (12 years ago)

Author:

mds

Message:

(mds) add remote temp support (temp2) to adm1025

(also in prog/sensors/chips.c),
rename /proc entries to in[0-5] and temp[1-2], fix negative
temperature reporting.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (2 diffs)
• kernel/chips/adm1025.c (modified) (10 diffs)

lm-sensors/trunk/CHANGES

@@ -20 +20 @@
 2.5.5 (2000????)
   Chip modules (all): Update mutex definition (works now for new 2.2 kernels)
-  File sensors.conf.eg: Add mtp008 entries
+  File sensors.conf.eg: Add mtp008 entries, adm1025 entries
   Library: Add ds1621, mtp008 support
   Module adm1021: Add support for adm1021a / adm1023
+  Module adm1025: Add support for remote temp; rename /proc entries to
+                  in[0-5] and temp[1-2]; fix negative temp readings
   Module ddcmon: allow force and force_ddcmon parameters
   Module ds1621: new
@@ -31 +33 @@
   Module w83781d: fix beep setting via /proc
   Program mkpatch.pl: more fixes
-  Program sensors: Add ds1621, mtp008 support, add -f (Fahrenheit) option
-  Program sensors-detect: Add ds1621, mtp008 detection
+  Program sensors: Add ds1621, mtp008 support; add -f (Fahrenheit) option;
+                   add adm1025 temp2; report temp limits correctly as
+                   min/max or limit/hysteresis
+  Program sensors-detect: Add ds1621, mtp008 detection;
+                          add ServerWorks detection (no driver yet)
 
 2.5.4 (20001012)

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

@@ -3 +3 @@
                monitoring
     Add by Gordon Wu <gwu@esoft.com> according to the adm9240.c written by
-
     Frodo Looijaard <frodol@dds.nl>
     and Philip Edelbrock <phil@netroedge.com>
@@ -22 +21 @@
 */
 
-/* Supports ADM10250. See doc/chips/adm9240 for details */
+/* Supports the Analog Devices ADM1025. See doc/chips/adm1025 for details */
 
 #include <linux/version.h>
@@ -108 +107 @@
 #define IN_FROM_REG(val,nr) (val)
 
-/* #define TEMP_FROM_REG(temp) \
-   ((temp)<256?((((temp)&0x1fe) >> 1) * 10)      + ((temp) & 1) * 5:  \
-               ((((temp)&0x1fe) >> 1) -255) * 10 - ((temp) & 1) * 5)  \
-*/
-#define TEMP_FROM_REG(temp) (((temp)>0x7f?(-temp):(temp))*10)
-
-#define TEMP_LIMIT_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*10)
-
+#define TEMP_FROM_REG(val) (((val)>0x80?(val)-0x100:(val))*10)
+#define TEMP_LIMIT_FROM_REG(val) TEMP_FROM_REG(val)
 #define TEMP_LIMIT_TO_REG(val) SENSORS_LIMIT(((val)<0?(((val)-5)/10):\
-                                                      ((val)+5)/10), \
-                                             0,255)
+                                                      ((val)+5)/10), 0, 255)
 
 #define ALARMS_FROM_REG(val) (val)
-
 
 #define VID_FROM_REG(val) ((val)==0x1f?0:(val)>=0x10?510-(val)*10:\
@@ -162 +153 @@
 
 #define ADM1025_INIT_RTEMP_MAX 600
-#define ADM1025_INIT_RTEMP_MIN 500
+#define ADM1025_INIT_RTEMP_MIN 0
 #define ADM1025_INIT_TEMP_MAX 600
-#define ADM1025_INIT_TEMP_MIN 500
+#define ADM1025_INIT_TEMP_MIN 0
 
 #ifdef MODULE
@@ -186 +177 @@
         u8 in_max[6];           /* Register value */
         u8 in_min[6];           /* Register value */
-        int rtemp;              /* Register value */
+        u8 rtemp;               /* Register value */
         u8 rtemp_max;           /* Register value */
-        u8 rtemp_min;           /* Register encoding, shifted right */
-        int temp;               /* Temp, shifted right */
+        u8 rtemp_min;           /* Register value */
+        u8 temp;                /* Register value */
         u8 temp_max;            /* Register value */
         u8 temp_min;            /* Register value */
@@ -225 +216 @@
                        int ctl_name, int *nrels_mag, long *results);
 static void adm1025_temp(struct i2c_client *client, int operation,
+                         int ctl_name, int *nrels_mag, long *results);
+static void adm1025_rm_temp(struct i2c_client *client, int operation,
                          int ctl_name, int *nrels_mag, long *results);
 static void adm1025_alarms(struct i2c_client *client, int operation,
@@ -260 +253 @@
    when a new copy is allocated. */
 static ctl_table adm1025_dir_table_template[] = {
-        {ADM1025_SYSCTL_IN0, "2.5V", NULL, 0, 0644, NULL, &sensors_proc_real,
+        {ADM1025_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &sensors_proc_real,
          &sensors_sysctl_real, NULL, &adm1025_in},
-        {ADM1025_SYSCTL_IN1, "Vccp1", NULL, 0, 0644, NULL, &sensors_proc_real,
+        {ADM1025_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &sensors_proc_real,
          &sensors_sysctl_real, NULL, &adm1025_in},
-        {ADM1025_SYSCTL_IN2, "3.3V", NULL, 0, 0644, NULL, &sensors_proc_real,
+        {ADM1025_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &sensors_proc_real,
          &sensors_sysctl_real, NULL, &adm1025_in},
-        {ADM1025_SYSCTL_IN3, "5V", NULL, 0, 0644, NULL, &sensors_proc_real,
+        {ADM1025_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &sensors_proc_real,
          &sensors_sysctl_real, NULL, &adm1025_in},
-        {ADM1025_SYSCTL_IN4, "12V", NULL, 0, 0644, NULL, &sensors_proc_real,
+        {ADM1025_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &sensors_proc_real,
          &sensors_sysctl_real, NULL, &adm1025_in},
-        {ADM1025_SYSCTL_IN5, "Vcc", NULL, 0, 0644, NULL, &sensors_proc_real,
+        {ADM1025_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &sensors_proc_real,
          &sensors_sysctl_real, NULL, &adm1025_in},
-        /*{ADM1025_SYSCTL_RTEMP, "Remote_temp", NULL, 0, 0644, NULL, &sensors_proc_real,
-         &sensors_sysctl_real, NULL, &adm1025_rm_temp},*/
-        {ADM1025_SYSCTL_TEMP, "Local_temp", NULL, 0, 0644, NULL, &sensors_proc_real,
+        {ADM1025_SYSCTL_RTEMP, "temp2", NULL, 0, 0644, NULL, &sensors_proc_real,
+         &sensors_sysctl_real, NULL, &adm1025_rm_temp},
+        {ADM1025_SYSCTL_TEMP, "temp1", NULL, 0, 0644, NULL, &sensors_proc_real,
          &sensors_sysctl_real, NULL, &adm1025_temp},
         {ADM1025_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &sensors_proc_real,
@@ -524 +517 @@
                 data->temp =
                     adm1025_read_value(client, ADM1025_REG_TEMP);
+                data->rtemp =
+                    adm1025_read_value(client, ADM1025_REG_RTEMP);
 #ifdef DEBUG
                 printk("The temp is %2x\n",data->temp);
@@ -531 +526 @@
                 data->temp_min =
                     adm1025_read_value(client, ADM1025_REG_TEMP_LOW);
+                data->rtemp_max =
+                    adm1025_read_value(client, ADM1025_REG_RTEMP_HIGH);
+                data->rtemp_min =
+                    adm1025_read_value(client, ADM1025_REG_RTEMP_LOW);
 
                 i = adm1025_read_value(client, ADM1025_REG_VID);
@@ -627 +626 @@
 }
 
+void adm1025_rm_temp(struct i2c_client *client, int operation, int ctl_name,
+                  int *nrels_mag, long *results)
+{
+        struct adm1025_data *data = client->data;
+        if (operation == SENSORS_PROC_REAL_INFO)
+                *nrels_mag = 1;
+        else if (operation == SENSORS_PROC_REAL_READ) {
+                adm1025_update_client(client);
+                results[0] = TEMP_LIMIT_FROM_REG(data->rtemp_max);
+                results[1] = TEMP_LIMIT_FROM_REG(data->rtemp_min);
+                results[2] = TEMP_FROM_REG(data->rtemp);
+                *nrels_mag = 3;
+        } else if (operation == SENSORS_PROC_REAL_WRITE) {
+                if (*nrels_mag >= 1) {
+                        data->temp_max = TEMP_LIMIT_TO_REG(results[0]);
+                        adm1025_write_value(client, ADM1025_REG_RTEMP_HIGH,
+                                            data->rtemp_max);
+                }
+                if (*nrels_mag >= 2) {
+                        data->temp_min = TEMP_LIMIT_TO_REG(results[1]);
+                        adm1025_write_value(client, ADM1025_REG_RTEMP_LOW,
+                                            data->rtemp_min);
+                }
+        }
+}
+
 void adm1025_alarms(struct i2c_client *client, int operation, int ctl_name,
                     int *nrels_mag, long *results)