Merge branch 'linus' into tracing/core

[pandora-kernel.git] / drivers / hwmon / lm87.c

diff --git a/drivers/hwmon/lm87.c b/drivers/hwmon/lm87.c
index 21970f0..2e4a3ce 100644 (file)
--- a/drivers/hwmon/lm87.c
+++ b/drivers/hwmon/lm87.c
@@ -21,11 +21,10 @@
  *   http://www.national.com/pf/LM/LM87.html
  *
  * Some functions share pins, so not all functions are available at the same
- * time. Which are depends on the hardware setup. This driver assumes that
- * the BIOS configured the chip correctly. In that respect, it  differs from
- * the original driver (from lm_sensors for Linux 2.4), which would force the
- * LM87 to an arbitrary, compile-time chosen mode, regardless of the actual
- * chipset wiring.
+ * time. Which are depends on the hardware setup. This driver normally
+ * assumes that firmware configured the chip correctly. Where this is not
+ * the case, platform code must set the I2C client's platform_data to point
+ * to a u8 value to be written to the channel register.
  * For reference, here is the list of exclusive functions:
  *  - in0+in5 (default) or temp3
  *  - fan1 (default) or in6
@@ -199,6 +198,7 @@ struct lm87_data {
        unsigned long last_updated; /* In jiffies */
 
        u8 channel;             /* register value */
+       u8 config;              /* original register value */
 
        u8 in[8];               /* register value */
        u8 in_max[8];           /* register value */
@@ -832,6 +832,7 @@ exit_remove:
        sysfs_remove_group(&new_client->dev.kobj, &lm87_group);
        sysfs_remove_group(&new_client->dev.kobj, &lm87_group_opt);
 exit_free:
+       lm87_write_value(new_client, LM87_REG_CONFIG, data->config);
        kfree(data);
 exit:
        return err;
@@ -840,12 +841,17 @@ exit:
 static void lm87_init_client(struct i2c_client *client)
 {
        struct lm87_data *data = i2c_get_clientdata(client);
-       u8 config;
 
-       data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);
+       if (client->dev.platform_data) {
+               data->channel = *(u8 *)client->dev.platform_data;
+               lm87_write_value(client,
+                                LM87_REG_CHANNEL_MODE, data->channel);
+       } else {
+               data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);
+       }
+       data->config = lm87_read_value(client, LM87_REG_CONFIG) & 0x6F;
 
-       config = lm87_read_value(client, LM87_REG_CONFIG);
-       if (!(config & 0x01)) {
+       if (!(data->config & 0x01)) {
                int i;
 
                /* Limits are left uninitialized after power-up */
@@ -867,11 +873,11 @@ static void lm87_init_client(struct i2c_client *client)
                        lm87_write_value(client, LM87_REG_IN_MAX(0), 0xFF);
                }
        }
-       if ((config & 0x81) != 0x01) {
-               /* Start monitoring */
+
+       /* Make sure Start is set and INT#_Clear is clear */
+       if ((data->config & 0x09) != 0x01)
                lm87_write_value(client, LM87_REG_CONFIG,
-                                (config & 0xF7) | 0x01);
-       }
+                                (data->config & 0x77) | 0x01);
 }
 
 static int lm87_remove(struct i2c_client *client)
@@ -882,6 +888,7 @@ static int lm87_remove(struct i2c_client *client)
        sysfs_remove_group(&client->dev.kobj, &lm87_group);
        sysfs_remove_group(&client->dev.kobj, &lm87_group_opt);
 
+       lm87_write_value(client, LM87_REG_CONFIG, data->config);
        kfree(data);
        return 0;
 }