Changeset 2427

Timestamp:

04/09/04 20:41:30 (5 years ago)

Author:

khali

Message:

The pc87360 driver now support the PC87365 and PC87366 as well,

and can write to registers. Untested.

Files:

• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/pc87360 (modified) (2 diffs)
• lm-sensors/trunk/kernel/chips/pc87360.c (modified) (11 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (2 diffs)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (2 diffs)

lm-sensors/trunk/doc/chips/SUMMARY

@@ -150 +150 @@
-        pc87363         -       -       2       2 pwm   no      yes (LPC)
-        pc87364         -       -       3       3 pwm   no      yes (LPC)
+        pc87365         -       -       3       3 pwm   no      yes (LPC)
+        pc87366         -       -       3       3 pwm   no      yes (LPC)
-
-sis5595

lm-sensors/trunk/doc/chips/pc87360

@@ -41 +41 @@
-the readings more range or accuracy. Not all RPM values can accurately be
-represented, so some rounding is done. With a divider of 2, the lowest
-2600 RPM
+1900 RPM. See doc/fan-divisors for details
-
-A different alarm is also triggered if the fan speed is too low to be
@@ -59 +59 @@
------------
-
-
-
-
-
+
+
+
+
+

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

@@ -103 +103 @@
-#define FAN_FROM_REG(val,div)   ((val)==0?-1:(val)==255?0: \
-                                 960000/((val)*(div)))
+#define FAN_TO_REG(val,div)     ((val)<=0?255: \
+                                 960000/((val)*(div)))
-#define FAN_DIV_FROM_REG(val)   (1 << ((val >> 5) & 0x03))
-PWM_FROM_REG(val)      (val
+FAN_DIV_TO_REG(val)    ((val)==8?0x60:(val)==4?0x40:(val)==1?0x00:0x20
-#define ALARM_FROM_REG(val)     ((val) & 0x07)
-
@@ -130 +132 @@
-
-static int pc87360_read_value(struct i2c_client *client, u8 register);
-#if 0
-static int pc87360_write_value(struct i2c_client *client, u8 register,
-                               u8 value);
-#endif
-static void pc87360_update_client(struct i2c_client *client);
-static void pc87360_init_client(struct i2c_client *client);
@@ -178 +178 @@
-
-static ctl_table pc87360_dir_table_template[] = { /* PC87363 too */
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan},
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan},
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan_div},
-        {PC87360_SYSCTL_FAN1_STATUS, "fan1_status", NULL, 0, 0444, NULL,
@@ -188 +188 @@
-        {PC87360_SYSCTL_FAN2_STATUS, "fan2_status", NULL, 0, 0444, NULL,
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan_status},
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_pwm},
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_pwm},
-        {0}
@@ -196 +196 @@
-
-static ctl_table pc87364_dir_table_template[] = { /* PC87365 and PC87366 too */
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan},
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan},
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan},
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan_div},
-        {PC87360_SYSCTL_FAN1_STATUS, "fan1_status", NULL, 0, 0444, NULL,
@@ -210 +210 @@
-        {PC87360_SYSCTL_FAN3_STATUS, "fan3_status", NULL, 0, 0444, NULL,
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan_status},
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_pwm},
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_pwm},
-4
+6
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_pwm},
-        {0}
@@ -357 +357 @@
-}
-
-#if 0
-static int pc87360_write_value(struct i2c_client *client, u8 reg, u8 value)
-{
@@ -363 +362 @@
-        return 0;
-}
-#endif
-
-static void pc87360_init_client(struct i2c_client *client)
@@ -410 +408 @@
-                *nrels_mag = 2;
-        }
-
-
+
+
+
+
+
+
+
+
+
+
-
-void pc87360_fan_div(struct i2c_client *client, int operation,
@@ -428 +434 @@
-                *nrels_mag = data->fannr;
-        }
+        /* We ignore National's recommendation */
+        else if (operation == SENSORS_PROC_REAL_WRITE) {
+                for (i = 0; i < data->fannr && i < *nrels_mag; i++) {
+                        /* Preserve fan min */
+                        int fan_min = FAN_FROM_REG(data->fan_min[i],
+                                                   FAN_DIV_FROM_REG(data->fan_status[i]));
+                        data->fan_status[i] = (data->fan_status[i] & 0x9F)
+                                            | FAN_DIV_TO_REG(results[i]);
+                        pc87360_write_value(client, PC87360_REG_FAN_STATUS(i),
+                                            data->fan_status[i]);
+                        data->fan_min[i] = FAN_TO_REG(fan_min,
+                                                      FAN_DIV_FROM_REG(data->fan_status[i]));
+                        pc87360_write_value(client, PC87360_REG_FAN_MIN(i),
+                                            data->fan_min[i]);
+                }
+        }
-}
-
@@ -440 +462 @@
-        else if (operation == SENSORS_PROC_REAL_READ) {
-                pc87360_update_client(client);
-PWM_FROM_REG(data->pwm[nr])
+data->pwm[nr]
-                *nrels_mag = 1;
+        }
+        else if (operation == SENSORS_PROC_REAL_WRITE) {
+                if (*nrels_mag >= 1)
+                {
+                        data->pwm[nr] = SENSORS_LIMIT(results[0], 0, 255);
+                        pc87360_write_value(client, PC87360_REG_PWM(nr),
+                                            data->pwm[nr]);
+                }
-        }
-}

lm-sensors/trunk/lib/chips.c

@@ -4259 +4259 @@
-                PC87360_SYSCTL_FAN2, VALUE(2), 0 },
-    { SENSORS_PC87360_FAN1_MIN, "fan1_min", SENSORS_PC87360_FAN1,
-
+W
-                VALUE(1), 0 },
-    { SENSORS_PC87360_FAN2_MIN, "fan2_min", SENSORS_PC87360_FAN2,
-
+W
-                VALUE(1), 0 },
-    { SENSORS_PC87360_FAN1_DIV, "fan1_div", SENSORS_PC87360_FAN1,
-
+W
-    { SENSORS_PC87360_FAN2_DIV, "fan2_div", SENSORS_PC87360_FAN2,
-
+W
-    { SENSORS_PC87360_FAN1_STATUS, "fan1_status", SENSORS_PC87360_FAN1,
-                NOMAP, R, PC87360_SYSCTL_FAN1_STATUS, VALUE(1), 0 },
@@ -4284 +4284 @@
-                PC87360_SYSCTL_FAN3, VALUE(2), 0 },
-    { SENSORS_PC87360_FAN1_MIN, "fan1_min", SENSORS_PC87360_FAN1,
-
+W
-                VALUE(1), 0 },
-    { SENSORS_PC87360_FAN2_MIN, "fan2_min", SENSORS_PC87360_FAN2,
-
+W
-                VALUE(1), 0 },
-    { SENSORS_PC87360_FAN3_MIN, "fan3_min", SENSORS_PC87360_FAN3,
-
+W
-                VALUE(1), 0 },
-    { SENSORS_PC87360_FAN1_DIV, "fan1_div", SENSORS_PC87360_FAN1,
-
+W
-    { SENSORS_PC87360_FAN2_DIV, "fan2_div", SENSORS_PC87360_FAN2,
-
+W
-    { SENSORS_PC87360_FAN3_DIV, "fan3_div", SENSORS_PC87360_FAN3,
-, PC87360_SYSCTL_FAN_DIV, VALUE(2
+W, PC87360_SYSCTL_FAN_DIV, VALUE(3
-    { SENSORS_PC87360_FAN1_STATUS, "fan1_status", SENSORS_PC87360_FAN1,
-                NOMAP, R, PC87360_SYSCTL_FAN1_STATUS, VALUE(1), 0 },

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

@@ -1374 +1374 @@
-      {
-        name => "Nat. Semi. PC87365 Super IO Sensors",
-to-be-written
+pc87360
-        devid => 0xe5,
-        logdev => 0x09, # fans; voltages at 0x0d; temps at 0x0e
@@ -1380 +1380 @@
-      {
-        name => "Nat. Semi. PC87366 Super IO Sensors",
-to-be-written
+pc87360
-        devid => 0xe9,
-        logdev => 0x09, # fans; voltages at 0x0d; temps at 0x0e