Commit a114851e authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman

[PATCH] I2C: Setting w83781d fan_div preserves fan_min

This patch makes the w83781d driver preserve fan_min settings when the
user changes fan_divs. This isn't done "by default" because the actual
fan min value (in RPMs) depends on both the fan_min register and the
fan_div register. Only two drivers handle it properly at the moment as
far as I know (lm78 and asb100). Several other drivers would need to be
fixed the same way, but well, once at a time ;)

Tested on my AS99127F rev.1.

Credits go to Philip Pokorny, since I think I remember he is the one who
introduced the method in the lm78 driver in the first place.

This tends to increase the size of the three set_store_regs_fan_div
functions, and I am considering refactoring them at some point. Later
though.
parent bd0c4341
...@@ -615,12 +615,21 @@ show_fan_div_reg(struct device *dev, char *buf, int nr) ...@@ -615,12 +615,21 @@ show_fan_div_reg(struct device *dev, char *buf, int nr)
(long) DIV_FROM_REG(data->fan_div[nr - 1])); (long) DIV_FROM_REG(data->fan_div[nr - 1]));
} }
/* Note: we save and restore the fan minimum here, because its value is
determined in part by the fan divisor. This follows the principle of
least suprise; the user doesn't expect the fan minimum to change just
because the divisor changed. */
static ssize_t static ssize_t
store_regs_fan_div_1(struct device *dev, const char *buf, size_t count) store_regs_fan_div_1(struct device *dev, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct w83781d_data *data = i2c_get_clientdata(client); struct w83781d_data *data = i2c_get_clientdata(client);
u32 reg; unsigned long min;
u8 reg;
/* Save fan_min */
min = FAN_FROM_REG(data->fan_min[0],
DIV_FROM_REG(data->fan_div[0]));
data->fan_div[0] = DIV_TO_REG(simple_strtoul(buf, NULL, 10), data->fan_div[0] = DIV_TO_REG(simple_strtoul(buf, NULL, 10),
data->type); data->type);
...@@ -636,6 +645,10 @@ store_regs_fan_div_1(struct device *dev, const char *buf, size_t count) ...@@ -636,6 +645,10 @@ store_regs_fan_div_1(struct device *dev, const char *buf, size_t count)
w83781d_write_value(client, W83781D_REG_VBAT, reg); w83781d_write_value(client, W83781D_REG_VBAT, reg);
} }
/* Restore fan_min */
data->fan_min[0] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[0]));
w83781d_write_value(client, W83781D_REG_FAN_MIN(1), data->fan_min[0]);
return count; return count;
} }
...@@ -644,7 +657,12 @@ store_regs_fan_div_2(struct device *dev, const char *buf, size_t count) ...@@ -644,7 +657,12 @@ store_regs_fan_div_2(struct device *dev, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct w83781d_data *data = i2c_get_clientdata(client); struct w83781d_data *data = i2c_get_clientdata(client);
u32 reg; unsigned long min;
u8 reg;
/* Save fan_min */
min = FAN_FROM_REG(data->fan_min[1],
DIV_FROM_REG(data->fan_div[1]));
data->fan_div[1] = DIV_TO_REG(simple_strtoul(buf, NULL, 10), data->fan_div[1] = DIV_TO_REG(simple_strtoul(buf, NULL, 10),
data->type); data->type);
...@@ -660,6 +678,10 @@ store_regs_fan_div_2(struct device *dev, const char *buf, size_t count) ...@@ -660,6 +678,10 @@ store_regs_fan_div_2(struct device *dev, const char *buf, size_t count)
w83781d_write_value(client, W83781D_REG_VBAT, reg); w83781d_write_value(client, W83781D_REG_VBAT, reg);
} }
/* Restore fan_min */
data->fan_min[1] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[1]));
w83781d_write_value(client, W83781D_REG_FAN_MIN(2), data->fan_min[1]);
return count; return count;
} }
...@@ -668,7 +690,12 @@ store_regs_fan_div_3(struct device *dev, const char *buf, size_t count) ...@@ -668,7 +690,12 @@ store_regs_fan_div_3(struct device *dev, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct i2c_client *client = to_i2c_client(dev);
struct w83781d_data *data = i2c_get_clientdata(client); struct w83781d_data *data = i2c_get_clientdata(client);
u32 reg; unsigned long min;
u8 reg;
/* Save fan_min */
min = FAN_FROM_REG(data->fan_min[2],
DIV_FROM_REG(data->fan_div[2]));
data->fan_div[2] = DIV_TO_REG(simple_strtoul(buf, NULL, 10), data->fan_div[2] = DIV_TO_REG(simple_strtoul(buf, NULL, 10),
data->type); data->type);
...@@ -684,6 +711,10 @@ store_regs_fan_div_3(struct device *dev, const char *buf, size_t count) ...@@ -684,6 +711,10 @@ store_regs_fan_div_3(struct device *dev, const char *buf, size_t count)
w83781d_write_value(client, W83781D_REG_VBAT, reg); w83781d_write_value(client, W83781D_REG_VBAT, reg);
} }
/* Restore fan_min */
data->fan_min[2] = FAN_TO_REG(min, DIV_FROM_REG(data->fan_div[2]));
w83781d_write_value(client, W83781D_REG_FAN_MIN(3), data->fan_min[2]);
return count; return count;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment