Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[mv-sheeva.git] / drivers / hwmon / w83781d.c

diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c
index 782117817526accac777032bc03dcc6209a20c34..e4c700356c441049aa975ef8d94e9d4a1c4f6040 100644 (file)
--- a/drivers/hwmon/w83781d.c
+++ b/drivers/hwmon/w83781d.c
@@ -57,6 +57,10 @@ I2C_CLIENT_INSMOD_5(w83781d, w83782d, w83783s, w83627hf, as99127f);
 I2C_CLIENT_MODULE_PARM(force_subclients, "List of subclient addresses: "
                    "{bus, clientaddr, subclientaddr1, subclientaddr2}");
 
+static int reset;
+module_param(reset, bool, 0);
+MODULE_PARM_DESC(reset, "Set to one to reset chip on load");
+
 static int init = 1;
 module_param(init, bool, 0);
 MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");
@@ -268,9 +272,8 @@ static int w83781d_isa_attach_adapter(struct i2c_adapter *adapter);
 static int w83781d_detect(struct i2c_adapter *adapter, int address, int kind);
 static int w83781d_detach_client(struct i2c_client *client);
 
-static int w83781d_read_value(struct i2c_client *client, u16 register);
-static int w83781d_write_value(struct i2c_client *client, u16 register,
-                              u16 value);
+static int w83781d_read_value(struct i2c_client *client, u16 reg);
+static int w83781d_write_value(struct i2c_client *client, u16 reg, u16 value);
 static struct w83781d_data *w83781d_update_device(struct device *dev);
 static void w83781d_init_client(struct i2c_client *client);
 
@@ -1460,8 +1463,17 @@ w83781d_init_client(struct i2c_client *client)
        int type = data->type;
        u8 tmp;
 
-       if (init && type != as99127f) { /* this resets registers we don't have
+       if (reset && type != as99127f) { /* this resets registers we don't have
                                           documentation for on the as99127f */
+               /* Resetting the chip has been the default for a long time,
+                  but it causes the BIOS initializations (fan clock dividers,
+                  thermal sensor types...) to be lost, so it is now optional.
+                  It might even go away if nobody reports it as being useful,
+                  as I see very little reason why this would be needed at
+                  all. */
+               dev_info(&client->dev, "If reset=1 solved a problem you were "
+                        "having, please report!\n");
+
                /* save these registers */
                i = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG);
                p = w83781d_read_value(client, W83781D_REG_PWMCLK12);
@@ -1478,6 +1490,13 @@ w83781d_init_client(struct i2c_client *client)
                w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0);
        }
 
+       /* Disable power-on abnormal beep, as advised by the datasheet.
+          Already done if reset=1. */
+       if (init && !reset && type != as99127f) {
+               i = w83781d_read_value(client, W83781D_REG_BEEP_CONFIG);
+               w83781d_write_value(client, W83781D_REG_BEEP_CONFIG, i | 0x80);
+       }
+
        data->vrm = vid_which_vrm();
 
        if ((type != w83781d) && (type != as99127f)) {