Changeset 2516

Timestamp:

05/09/04 09:24:37 (9 years ago)

Author:

khali

Message:

Discard unused variable in private driver data.

Less agressive initialization process (do not reset the chip,
closes ticket #1154; preserve application mode)
Fix temp1 (instead of temp2) limits being unsettable in application
mode 2 (tickets #894 and #1219).
Ensure that temp2 and in4 are not used at the same time (ticket
#894).

Files:

• lm-sensors/trunk/kernel/chips/gl520sm.c (modified) (6 diffs)

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

@@ -124 +124 @@
         char valid;             /* !=0 if following fields are valid */
         unsigned long last_updated;     /* In jiffies */
-        unsigned long last_updated_v00;
-        /* In jiffies (used only by rev00 chips) */
 
         u8 voltage[5];          /* Register values; [0] = VDD */
@@ -342 +340 @@
 
         /* Initialize the GL520SM chip */
-        data->two_temps = 1;
         data->alarm_mask = 0xff;
         gl520_init_client(new_client);
+        if (data->two_temps)
+                data->voltage_max[4] = data->voltage_min[4] =
+                        data->voltage[4] = 0;
+        else
+                data->temp_hyst[1] = data->temp_over[1] =
+                        data->temp[1] = 0;
+
         return 0;
 
@@ -360 +364 @@
 
 
-/* Called when we have found a new GL520SM. It should set limits, etc. */
+/* Called when we have found a new GL520SM. */
 static void gl520_init_client(struct i2c_client *client)
 {
-        /* Power-on defaults (bit 7=1) */
-        gl520_write_value(client, GL520_REG_CONF, 0x80);
-
-        /* No noisy output (bit 2=1), Comparator mode (bit 3=0), two fans (bit4=0),
-           standby mode (bit6=0) */
-        gl520_write_value(client, GL520_REG_CONF, 0x04);
-
-        /* Never interrupts */
-        gl520_write_value(client, GL520_REG_MASK, 0x00);
-
-        /* Clear status register (bit 5=1), start (bit6=1) */
-        gl520_write_value(client, GL520_REG_CONF, 0x24);
-        gl520_write_value(client, GL520_REG_CONF, 0x44);
+        struct gl520_data *data = (struct gl520_data *)(client->data);
+        u8 oldconf, conf;
+
+        conf = oldconf = gl520_read_value(client, GL520_REG_CONF);
+        data->two_temps = !(conf & 0x10);
+
+        /* If IRQ# is disabled, we can safely force comparator mode */
+        if (!(conf & 0x20))
+                conf &= 0xf7;
+
+        /* Enable monitoring if needed */
+        conf |= 0x40;
+
+        if (conf != oldconf)
+                gl520_write_value(client, GL520_REG_CONF, conf);
 }
 
@@ -482 +488 @@
 
                 /* Temp1 and Vin4 are the same input */
-                data->temp[1] = gl520_read_value(client, GL520_REG_TEMP2);
-                data->temp_over[1] =
-                    gl520_read_value(client, GL520_REG_TEMP2_OVER);
-                data->temp_hyst[1] =
-                    gl520_read_value(client, GL520_REG_TEMP2_HYST);
-
-                data->voltage[4] =
-                    gl520_read_value(client, GL520_REG_VIN4);
-                data->voltage_min[4] =
-                    gl520_read_value(client, GL520_REG_VIN4_MIN);
-                data->voltage_max[4] =
-                    gl520_read_value(client, GL520_REG_VIN4_MAX);
+                if (data->two_temps) {
+                        data->temp[1] =
+                            gl520_read_value(client, GL520_REG_TEMP2);
+                        data->temp_over[1] =
+                            gl520_read_value(client, GL520_REG_TEMP2_OVER);
+                        data->temp_hyst[1] =
+                            gl520_read_value(client, GL520_REG_TEMP2_HYST);
+                } else {
+                        data->voltage[4] =
+                            gl520_read_value(client, GL520_REG_VIN4);
+                        data->voltage_min[4] =
+                            gl520_read_value(client, GL520_REG_VIN4_MIN);
+                        data->voltage_max[4] =
+                            gl520_read_value(client, GL520_REG_VIN4_MAX);
+                }
 
                 data->last_updated = jiffies;
@@ -518 +527 @@
                 *nrels_mag = 3;
         } else if (operation == SENSORS_PROC_REAL_WRITE) {
-                if ((nr == 0) && (!data->two_temps))
+                if ((nr == 1) && (!data->two_temps))
                         return;
                 regnr =
@@ -767 +776 @@
                                 old |= 0x10;
                                 data->two_temps = 0;
+                                data->temp_hyst[1] = data->temp_over[1] =
+                                        data->temp[1] = 0;
                         } else {
                                 data->two_temps = 1;
+                                data->voltage_max[4] = data->voltage_min[4] =
+                                        data->voltage[4] = 0;
                         }
                         gl520_write_value(client, GL520_REG_CONF, old);