Changeset 2453

Timestamp:

04/19/04 21:46:14 (5 years ago)

Author:

khali

Message:

Support voltages and temperatures of National Semiconductor

PC87365 and PC87366 (read-only).

Files:

• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/pc87360 (modified) (3 diffs)
• lm-sensors/trunk/kernel/chips/pc87360.c (modified) (27 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (4 diffs)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (3 diffs)
• lm-sensors/trunk/prog/sensors/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/doc/chips/SUMMARY

@@ -159 +159 @@
-        pc87363         -       -       2       2 pwm   no      yes (LPC)
-        pc87364         -       -       3       3 pwm   no      yes (LPC)
--      -
--      -
+2      11
+3      11
-
-sis5595

lm-sensors/trunk/doc/chips/pc87360

@@ -33 +33 @@
-hardware monitoring chipsets, not only controling and monitoring three fans,
-but also monitoring eleven voltage inputs and two (PC87365) or three
-
-
+
-
-Fan rotation speeds are reported in RPM (revolutions per minute). An alarm
@@ -48 +47 @@
-PWM values are from 0 to 255.
-
+Temperatures are reported in degrees Celcius. Each temperature measured has
+associated low limit, high limit and overtemperature limit, each of which
+triggers an alarm when crossed.
+
+Voltages are reported relatively to a relative voltage, either internal or
+external. Some of them are divided by two internally, you will have to
+compensate in sensors.conf. Each voltage measured has associated low and
+high limit, each of which triggers an alarm when crossed.
+
-If an alarm triggers, it will remain triggered until the hardware register
-is read at least once. This means that the cause for the alarm may 
@@ -59 +67 @@
------------
-
-is driver only supports fans
+e voltages and temperatures are read-only
-
-The datasheets suggests that some values (fan mins, fan divisors)

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

@@ -45 +45 @@
-static unsigned int normal_isa_range[] = { SENSORS_ISA_END };
-static u8 devid;
+static unsigned int extra_isa[] = { 0x0000, 0x0000, 0x0000 };
-
-SENSORS_INSMOD_5(pc87360, pc87363, pc87364, pc87365, pc87366);
-
-
+
+
+
+
-#define REG     0x2e    /* The register to read/write */
+#define VAL     0x2f    /* The value to read/write */
+
-#define DEV     0x07    /* Register: Logical device select */
-#define VAL     0x2f    /* The value to read/write */
-#define FSCM    0x09    /* The device with the fan registers in it */
-#define DEVID   0x20    /* Register: Device ID */
+#define ACT     0x30    /* Register: Device activation */
+#define BASE    0x60    /* Register: Base address */
+
+#define FSCM    0x09    /* Logical device: fans */
+#define VLM     0x0d    /* Logical device: voltages */
+#define TMS     0x0e    /* Logical device: temperatures */
+static const u8 logdev[3] = { FSCM, VLM, TMS };
-
-static inline void superio_outb(int reg, int val)
@@ -67 +78 @@
-}
-
-static inline void superio_select(void)
-{
-        outb(DEV, REG);
-        outb(FSCM, VAL);
-}
-
-static inline void superio_exit(void)
-{
@@ -79 +84 @@
-}
-
+#define PC87360_EXTENT          0x10
+
-/*
-
-
-
-
+
- */
-#define PC87360_DEVID_MATCH(id) ((id) == 0xE1 || (id) == 0xE8 || \
-                                 (id) == 0xE4 || (id) == 0xE5 || \
-                                 (id) == 0xE9)
-
-#define PC87360_BASE_REG        0x60
-#define PC87360_ACTIVATE_REG    0x30
-
-#define PC87360_EXTENT          0x10
-
-/* nr has to be 0 or 1 (PC87360/87363) or 2 (PC87364/87365/87366) */
@@ -101 +97 @@
-#define PC87360_REG_FAN_STATUS(nr)      (0x08 + 3 * (nr))
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-struct pc87360_data {
@@ -113 +143 @@
-        struct semaphore lock;
-        int sysctl_id;
+        int address[3];
-
-        struct semaphore update_lock;
@@ -118 +149 @@
-        unsigned long last_updated;     /* In jiffies */
-
-
+, innr, tempnr
-
-        u8 fan[3];              /* Register value */
@@ -124 +155 @@
-        u8 fan_status[3];       /* Register value */
-        u8 pwm[3];              /* Register value */
+
+        u8 in[11];              /* Register value */
+        u8 in_min[11];          /* Register value */
+        u8 in_max[11];          /* Register value */
+        u8 in_status[11];       /* Register value */
+        u16 in_alarms;          /* Register values, combined */
+
+        u8 temp[3];             /* Register value */
+        u8 temp_min[3];         /* Register value */
+        u8 temp_max[3];         /* Register value */
+        u8 temp_crit[3];        /* Register value */
+        u8 temp_status[3];      /* Register value */
+        u8 temp_alarms;         /* Register value */
-};
-
@@ -132 +176 @@
-static int pc87360_detach_client(struct i2c_client *client);
-
-i2c_client *client, u8 register
-i2c_client *client, u8 register
+pc87360_data *data, int ldi, u8 reg
+pc87360_data *data, int ldi, u8 reg
-                               u8 value);
-static void pc87360_update_client(struct i2c_client *client);
-
-
-
+
+
+
+
+
-
-static void pc87360_fan(struct i2c_client *client, int operation,
@@ -149 +195 @@
-                        int ctl_name, int *nrels_mag, long *results);
-
+void pc87365_in(struct i2c_client *client, int operation, int ctl_name,
+                int *nrels_mag, long *results);
+void pc87365_in_status(struct i2c_client *client, int operation, int ctl_name,
+                       int *nrels_mag, long *results);
+
+void pc87365_temp(struct i2c_client *client, int operation, int ctl_name,
+                  int *nrels_mag, long *results);
+void pc87365_temp_status(struct i2c_client *client, int operation, int ctl_name,
+                         int *nrels_mag, long *results);
+
-static int pc87360_id = 0;
-
@@ -160 +216 @@
-
-/* -- SENSORS SYSCTL START -- */
+
+#define PC87365_SYSCTL_ALARMS           100 /* bit field */
-
-#define PC87360_SYSCTL_FAN1             1101 /* Rotations/min */
@@ -172 +230 @@
-#define PC87360_SYSCTL_PWM3             1403 /* not for PC87360/PC87363 */
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-/* -- SENSORS SYSCTL END -- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        {PC87360_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL,
-         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan},
@@ -220 +298 @@
-};
-
+static ctl_table pc87365_dir_table_template[] = { /* PC87366 too */
+        {PC87365_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_alarms},
+        {PC87360_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan},
+        {PC87360_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan},
+        {PC87360_SYSCTL_FAN3, "fan3", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan},
+        {PC87360_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan_div},
+        {PC87360_SYSCTL_FAN1_STATUS, "fan1_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan_status},
+        {PC87360_SYSCTL_FAN2_STATUS, "fan2_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan_status},
+        {PC87360_SYSCTL_FAN3_STATUS, "fan3_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_fan_status},
+        {PC87360_SYSCTL_PWM1, "pwm1", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_pwm},
+        {PC87360_SYSCTL_PWM2, "pwm2", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_pwm},
+        {PC87360_SYSCTL_PWM3, "pwm3", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87360_pwm},
+        {PC87365_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN7, "in7", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN8, "in8", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN9, "in9", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN10, "in10", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in},
+        {PC87365_SYSCTL_IN0_STATUS, "in0_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_IN1_STATUS, "in1_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_IN2_STATUS, "in2_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_IN3_STATUS, "in3_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_IN4_STATUS, "in4_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_IN5_STATUS, "in5_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_IN6_STATUS, "in6_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_IN7_STATUS, "in7_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_IN8_STATUS, "in8_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_IN9_STATUS, "in9_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_IN10_STATUS, "in10_status", NULL, 0, 0444, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_in_status},
+        {PC87365_SYSCTL_TEMP1, "temp1", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_temp},
+        {PC87365_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_temp},
+        {PC87365_SYSCTL_TEMP3, "temp3", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_temp},
+        {PC87365_SYSCTL_TEMP1_STATUS, "temp1_status", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_temp_status},
+        {PC87365_SYSCTL_TEMP2_STATUS, "temp2_status", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_temp_status},
+        {PC87365_SYSCTL_TEMP3_STATUS, "temp3_status", NULL, 0, 0644, NULL,
+         &i2c_proc_real, &i2c_sysctl_real, NULL, &pc87365_temp_status},
+        {0}
+};
+
-static int pc87360_attach_adapter(struct i2c_adapter *adapter)
-{
@@ -225 +385 @@
-}
-
-int *address, u8 *devid
+u8 *devid, int *address
-{
-        u16 val;
+        int i;
+        int nrdev; /* logical device count */
-
-        /* no superio_enter */
+
+        /* identify device */
-        val = superio_inb(DEVID);
-
+
+
+
+
+
+
+
+
+
+
+
-                superio_exit();
-                return -ENODEV;
-        }
+        /* remember the device id */
-        *devid = val;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -259 +438 @@
-}
-
+/* We should not trust the address, it is unset.
+   Read from extra_isa instead. */
-int pc87360_detect(struct i2c_adapter *adapter, int address,
-                   unsigned short flags, int kind)
@@ -273 +454 @@
-        }
-
-
-
-
+
+
+
+
+
-        }
-
@@ -291 +474 @@
-
-        data->fannr = 2;
-
+
+
+
-        switch (devid) {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        strcpy(new_client->name, client_name);
-
@@ -321 +514 @@
-
-        if ((i = i2c_register_entry((struct i2c_client *) new_client,
-
-
-
+
+
-                                    pc87360_dir_table_template)) < 0) {
-                err = i;
@@ -330 +522 @@
-        data->sysctl_id = i;
-
-        pc87360_init_client(new_client);
-        return 0;
-
@@ -343 +534 @@
-static int pc87360_detach_client(struct i2c_client *client)
-{
-
-
-
+
+
+
+
-
-        if ((err = i2c_detach_client(client))) {
@@ -353 +545 @@
-        }
-
-
+
+
+
+
+
-        kfree(client->data);
-
@@ -359 +555 @@
-}
-
-
+
+
+
+
+
-{
-        int res;
-
-
+
+
+
-        return res;
-}
-
-
-
-
+
+
+
+
+
+
-        return 0;
-}
-
-static void pc87360_init_client(struct i2c_client *client)
-{
-        /* nothing yet, read only driver */
-}
-
@@ -388 +588 @@
-            (jiffies < data->last_updated) || !data->valid) {
-                for (i = 0; i < data->fannr; i++) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -401 +625 @@
-}
-
+
+void pc87365_alarms(struct i2c_client *client, int operation, int ctl_name,
+                    int *nrels_mag, long *results)
+{
+        struct pc87360_data *data = client->data;
+
+        if (operation == SENSORS_PROC_REAL_INFO)
+                *nrels_mag = 0;
+        else if (operation == SENSORS_PROC_REAL_READ) {
+                pc87360_update_client(client);
+                results[0] = data->in_alarms;
+                results[1] = data->temp_alarms;
+                *nrels_mag = 2;
+        }
+}
-
-void pc87360_fan(struct i2c_client *client, int operation, int ctl_name,
@@ -423 +662 @@
-                        data->fan_min[nr] = FAN_TO_REG(results[0],
-                                                       FAN_DIV_FROM_REG(data->fan_status[nr]));
-client
+data, 0
-                                            data->fan_min[nr]);
-                }
@@ -452 +691 @@
-                        data->fan_status[i] = (data->fan_status[i] & 0x9F)
-                                            | FAN_DIV_TO_REG(results[i]);
-client
+data, 0
-                                            data->fan_status[i]);
-                        data->fan_min[i] = FAN_TO_REG(fan_min,
-                                                      FAN_DIV_FROM_REG(data->fan_status[i]));
-client
+data, 0
-                                            data->fan_min[i]);
-                }
@@ -479 +718 @@
-                {
-                        data->pwm[nr] = SENSORS_LIMIT(results[0], 0, 255);
-client
+data, 0
-                                            data->pwm[nr]);
-                }
@@ -495 +734 @@
-        else if (operation == SENSORS_PROC_REAL_READ) {
-                pc87360_update_client(client);
-ALARM_FROM_REG(data->pwm
+FAN_STATUS_FROM_REG(data->fan_status
-                *nrels_mag = 1;
-        }
-}
-
+void pc87365_in(struct i2c_client *client, int operation, int ctl_name,
+                int *nrels_mag, long *results)
+{
+        struct pc87360_data *data = client->data;
+        int nr = ctl_name - PC87365_SYSCTL_IN0;
+
+        if (operation == SENSORS_PROC_REAL_INFO)
+                *nrels_mag = 3;
+        else if (operation == SENSORS_PROC_REAL_READ) {
+                pc87360_update_client(client);
+                results[0] = IN_FROM_REG(data->in_max[nr]);
+                results[1] = IN_FROM_REG(data->in_min[nr]);
+                results[2] = IN_FROM_REG(data->in[nr]);
+                *nrels_mag = 3;
+        }
+}
+
+void pc87365_in_status(struct i2c_client *client, int operation, int ctl_name,
+                       int *nrels_mag, long *results)
+{
+        struct pc87360_data *data = client->data;
+        int nr = ctl_name - PC87365_SYSCTL_IN0_STATUS;
+
+        if (operation == SENSORS_PROC_REAL_INFO)
+                *nrels_mag = 0;
+        else if (operation == SENSORS_PROC_REAL_READ) {
+                pc87360_update_client(client);
+                results[0] = IN_STATUS_FROM_REG(data->in_status[nr]);
+                *nrels_mag = 1;
+        }
+}
+
+void pc87365_temp(struct i2c_client *client, int operation, int ctl_name,
+                  int *nrels_mag, long *results)
+{
+        struct pc87360_data *data = client->data;
+        int nr = ctl_name - PC87365_SYSCTL_TEMP1;
+
+        if (operation == SENSORS_PROC_REAL_INFO)
+                *nrels_mag = 0;
+        else if (operation == SENSORS_PROC_REAL_READ) {
+                pc87360_update_client(client);
+                results[0] = TEMP_FROM_REG(data->temp_max[nr]);
+                results[1] = TEMP_FROM_REG(data->temp_min[nr]);
+                results[1] = TEMP_FROM_REG(data->temp_crit[nr]);
+                results[2] = TEMP_FROM_REG(data->temp[nr]);
+                *nrels_mag = 4;
+        }
+}
+
+void pc87365_temp_status(struct i2c_client *client, int operation, int ctl_name,
+                         int *nrels_mag, long *results)
+{
+        struct pc87360_data *data = client->data;
+        int nr = ctl_name - PC87365_SYSCTL_TEMP1_STATUS;
+
+        if (operation == SENSORS_PROC_REAL_INFO)
+                *nrels_mag = 0;
+        else if (operation == SENSORS_PROC_REAL_READ) {
+                pc87360_update_client(client);
+                results[0] = TEMP_STATUS_FROM_REG(data->temp_status[nr]);
+                *nrels_mag = 1;
+        }
+}
+
+
-static int __init pc87360_init(void)
-{
-        int addr;
-
-        printk("pc87360.o version %s (%s)\n", LM_VERSION, LM_DATE);
-
-addr, &devid
+devid, extra_isa
-                printk("pc87360.o: PC8736x not detected, module not inserted.\n");
-                return -ENODEV;
-        }
-        normal_isa[0] = addr;
-
-        return i2c_add_driver(&pc87360_driver);

lm-sensors/trunk/lib/chips.c

@@ -4258 +4258 @@
-    { SENSORS_PC87360_FAN2, "fan2", NOMAP, NOMAP, R,
-                PC87360_SYSCTL_FAN2, VALUE(2), 0 },
+    { SENSORS_PC87360_FAN3, "fan3", NOMAP, NOMAP, R,
+                PC87360_SYSCTL_FAN3, VALUE(2), 0 },
-    { SENSORS_PC87360_FAN1_MIN, "fan1_min", SENSORS_PC87360_FAN1,
-                SENSORS_PC87360_FAN1, RW, PC87360_SYSCTL_FAN1,
@@ -4264 +4266 @@
-                SENSORS_PC87360_FAN2, RW, PC87360_SYSCTL_FAN2,
-                VALUE(1), 0 },
+    { SENSORS_PC87360_FAN3_MIN, "fan3_min", SENSORS_PC87360_FAN3,
+                SENSORS_PC87360_FAN3, RW, PC87360_SYSCTL_FAN3,
+                VALUE(1), 0 },
-    { SENSORS_PC87360_FAN1_DIV, "fan1_div", SENSORS_PC87360_FAN1,
-                NOMAP, RW, PC87360_SYSCTL_FAN_DIV, VALUE(1), 0 },
-    { SENSORS_PC87360_FAN2_DIV, "fan2_div", SENSORS_PC87360_FAN2,
-                NOMAP, RW, PC87360_SYSCTL_FAN_DIV, VALUE(2), 0 },
+    { SENSORS_PC87360_FAN3_DIV, "fan3_div", SENSORS_PC87360_FAN3,
+                NOMAP, RW, PC87360_SYSCTL_FAN_DIV, VALUE(3), 0 },
-    { SENSORS_PC87360_FAN1_STATUS, "fan1_status", SENSORS_PC87360_FAN1,
-                NOMAP, R, PC87360_SYSCTL_FAN1_STATUS, VALUE(1), 0 },
-    { SENSORS_PC87360_FAN2_STATUS, "fan2_status", SENSORS_PC87360_FAN2,
-                NOMAP, R, PC87360_SYSCTL_FAN2_STATUS, VALUE(1), 0 },
+    { SENSORS_PC87360_FAN3_STATUS, "fan3_status", SENSORS_PC87360_FAN3,
+                NOMAP, R, PC87360_SYSCTL_FAN3_STATUS, VALUE(1), 0 },
-    { 0 }
-  };
-
-4
+5
-  { 
+    { SENSORS_PC87360_ALARMS_IN, "alarms_in", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_ALARMS, VALUE(1), 0 },
+    { SENSORS_PC87360_ALARMS_TEMP, "alarms_temp", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_ALARMS, VALUE(2), 0 },
-    { SENSORS_PC87360_FAN1, "fan1", NOMAP, NOMAP, R,
-                PC87360_SYSCTL_FAN1, VALUE(2), 0 },
@@ -4304 +4317 @@
-    { SENSORS_PC87360_FAN3_STATUS, "fan3_status", SENSORS_PC87360_FAN3,
-                NOMAP, R, PC87360_SYSCTL_FAN3_STATUS, VALUE(1), 0 },
+    { SENSORS_PC87360_IN0, "in0", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN0, VALUE(3), 2 },
+    { SENSORS_PC87360_IN1, "in1", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN1, VALUE(3), 2 },
+    { SENSORS_PC87360_IN2, "in2", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN2, VALUE(3), 2 },
+    { SENSORS_PC87360_IN3, "in3", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN3, VALUE(3), 2 },
+    { SENSORS_PC87360_IN4, "in4", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN4, VALUE(3), 2 },
+    { SENSORS_PC87360_IN5, "in5", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN5, VALUE(3), 2 },
+    { SENSORS_PC87360_IN6, "in6", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN6, VALUE(3), 2 },
+    { SENSORS_PC87360_IN7, "in7", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN7, VALUE(3), 2 },
+    { SENSORS_PC87360_IN8, "in8", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN8, VALUE(3), 2 },
+    { SENSORS_PC87360_IN9, "in9", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN9, VALUE(3), 2 },
+    { SENSORS_PC87360_IN10, "in10", NOMAP, NOMAP, R,
+                PC87365_SYSCTL_IN10, VALUE(3), 2 },
+    { SENSORS_PC87360_IN0_MIN, "in0_min", SENSORS_PC87360_IN0,
+                SENSORS_PC87360_IN0, RW, PC87365_SYSCTL_IN0,
+                VALUE(1), 2 },
+    { SENSORS_PC87360_IN1_MIN, "in1_min", SENSORS_PC87360_IN1,
+                SENSORS_PC87360_IN1, RW, PC87365_SYSCTL_IN1,
+                VALUE(1), 2 },
+    { SENSORS_PC87360_IN2_MIN, "in2_min", SENSORS_PC87360_IN2,
+                SENSORS_PC87360_IN2, RW, PC87365_SYSCTL_IN2,
+                VALUE(1), 2 },
+    { SENSORS_PC87360_IN3_MIN, "in3_min", SENSORS_PC87360_IN3,
+                SENSORS_PC87360_IN3, RW, PC87365_SYSCTL_IN3,
+                VALUE(1), 2 },
+    { SENSORS_PC87360_IN4_MIN, "in4_min", SENSORS_PC87360_IN4,
+                SENSORS_PC87360_IN4, RW, PC87365_SYSCTL_IN4,
+                VALUE(1), 2 },
+    { SENSORS_PC87360_IN5_MIN, "in5_min", SENSORS_PC87360_IN5,
+                SENSORS_PC87360_IN5, RW, PC87365_SYSCTL_IN5,
+                VALUE(1), 2 },
+    { SENSORS_PC87360_IN6_MIN, "in6_min", SENSORS_PC87360_IN6,
+                SENSORS_PC87360_IN6, RW, PC87365_SYSCTL_IN6,
+                VALUE(1), 2 },
+    { SENSORS_PC87360_IN7_MIN, "in7_min", SENSORS_PC87360_IN7,
+                SENSORS_PC87360_IN7, RW, PC87365_SYSCTL_IN7,
+                VALUE(1), 2 },
+    { SENSORS_PC87360_IN8_MIN, "in8_min", SENSORS_PC87360_IN8,
+                SENSORS_PC87360_IN8, RW, PC87365_SYSCTL_IN8,
+                VALUE(1), 2 },
+    { SENSORS_PC87360_IN9_MIN, "in9_min", SENSORS_PC87360_IN9,
+                SENSORS_PC87360_IN9, RW, PC87365_SYSCTL_IN9,