|
@@ -389,6 +389,7 @@ static int __devexit w83627hf_remove(struct platform_device *pdev);
|
|
|
|
|
|
static int w83627hf_read_value(struct w83627hf_data *data, u16 reg);
|
|
|
static int w83627hf_write_value(struct w83627hf_data *data, u16 reg, u16 value);
|
|
|
+static void w83627hf_update_fan_div(struct w83627hf_data *data);
|
|
|
static struct w83627hf_data *w83627hf_update_device(struct device *dev);
|
|
|
static void w83627hf_init_device(struct platform_device *pdev);
|
|
|
|
|
@@ -1206,6 +1207,7 @@ static int __devinit w83627hf_probe(struct platform_device *pdev)
|
|
|
data->fan_min[0] = w83627hf_read_value(data, W83781D_REG_FAN_MIN(1));
|
|
|
data->fan_min[1] = w83627hf_read_value(data, W83781D_REG_FAN_MIN(2));
|
|
|
data->fan_min[2] = w83627hf_read_value(data, W83781D_REG_FAN_MIN(3));
|
|
|
+ w83627hf_update_fan_div(data);
|
|
|
|
|
|
/* Register common device attributes */
|
|
|
if ((err = sysfs_create_group(&dev->kobj, &w83627hf_group)))
|
|
@@ -1540,6 +1542,24 @@ static void __devinit w83627hf_init_device(struct platform_device *pdev)
|
|
|
| 0x01);
|
|
|
}
|
|
|
|
|
|
+static void w83627hf_update_fan_div(struct w83627hf_data *data)
|
|
|
+{
|
|
|
+ int reg;
|
|
|
+
|
|
|
+ reg = w83627hf_read_value(data, W83781D_REG_VID_FANDIV);
|
|
|
+ data->fan_div[0] = (reg >> 4) & 0x03;
|
|
|
+ data->fan_div[1] = (reg >> 6) & 0x03;
|
|
|
+ if (data->type != w83697hf) {
|
|
|
+ data->fan_div[2] = (w83627hf_read_value(data,
|
|
|
+ W83781D_REG_PIN) >> 6) & 0x03;
|
|
|
+ }
|
|
|
+ reg = w83627hf_read_value(data, W83781D_REG_VBAT);
|
|
|
+ data->fan_div[0] |= (reg >> 3) & 0x04;
|
|
|
+ data->fan_div[1] |= (reg >> 4) & 0x04;
|
|
|
+ if (data->type != w83697hf)
|
|
|
+ data->fan_div[2] |= (reg >> 5) & 0x04;
|
|
|
+}
|
|
|
+
|
|
|
static struct w83627hf_data *w83627hf_update_device(struct device *dev)
|
|
|
{
|
|
|
struct w83627hf_data *data = dev_get_drvdata(dev);
|
|
@@ -1617,18 +1637,8 @@ static struct w83627hf_data *w83627hf_update_device(struct device *dev)
|
|
|
w83627hf_read_value(data, W83781D_REG_TEMP_HYST(3));
|
|
|
}
|
|
|
|
|
|
- i = w83627hf_read_value(data, W83781D_REG_VID_FANDIV);
|
|
|
- data->fan_div[0] = (i >> 4) & 0x03;
|
|
|
- data->fan_div[1] = (i >> 6) & 0x03;
|
|
|
- if (data->type != w83697hf) {
|
|
|
- data->fan_div[2] = (w83627hf_read_value(data,
|
|
|
- W83781D_REG_PIN) >> 6) & 0x03;
|
|
|
- }
|
|
|
- i = w83627hf_read_value(data, W83781D_REG_VBAT);
|
|
|
- data->fan_div[0] |= (i >> 3) & 0x04;
|
|
|
- data->fan_div[1] |= (i >> 4) & 0x04;
|
|
|
- if (data->type != w83697hf)
|
|
|
- data->fan_div[2] |= (i >> 5) & 0x04;
|
|
|
+ w83627hf_update_fan_div(data);
|
|
|
+
|
|
|
data->alarms =
|
|
|
w83627hf_read_value(data, W83781D_REG_ALARM1) |
|
|
|
(w83627hf_read_value(data, W83781D_REG_ALARM2) << 8) |
|