hwmon: (w83795) Fix fan control mode attributes
There were two bugs: * Speed cruise mode was improperly reported for all fans but fan1. * Fan control method (PWM vs. DC) was mixed with the control mode. It will be added back as a separate attribute, as per the standard sysfs interface. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com>
This commit is contained in:
parent
61ec2da506
commit
ae51cd9bcd
|
@ -857,20 +857,20 @@ show_pwm_enable(struct device *dev, struct device_attribute *attr, char *buf)
|
||||||
int index = sensor_attr->index;
|
int index = sensor_attr->index;
|
||||||
u8 tmp;
|
u8 tmp;
|
||||||
|
|
||||||
if (1 == (data->pwm_fcms[0] & (1 << index))) {
|
/* Speed cruise mode */
|
||||||
|
if (data->pwm_fcms[0] & (1 << index)) {
|
||||||
tmp = 2;
|
tmp = 2;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
/* Thermal cruise or SmartFan IV mode */
|
||||||
for (tmp = 0; tmp < 6; tmp++) {
|
for (tmp = 0; tmp < 6; tmp++) {
|
||||||
if (data->pwm_tfmr[tmp] & (1 << index)) {
|
if (data->pwm_tfmr[tmp] & (1 << index)) {
|
||||||
tmp = 3;
|
tmp = 3;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (data->pwm_fomc & (1 << index))
|
/* Manual mode */
|
||||||
tmp = 0;
|
tmp = 1;
|
||||||
else
|
|
||||||
tmp = 1;
|
|
||||||
|
|
||||||
out:
|
out:
|
||||||
return sprintf(buf, "%u\n", tmp);
|
return sprintf(buf, "%u\n", tmp);
|
||||||
|
@ -890,23 +890,21 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,
|
||||||
|
|
||||||
if (strict_strtoul(buf, 10, &val) < 0)
|
if (strict_strtoul(buf, 10, &val) < 0)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (val > 2)
|
if (val < 1 || val > 2)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
mutex_lock(&data->update_lock);
|
mutex_lock(&data->update_lock);
|
||||||
switch (val) {
|
switch (val) {
|
||||||
case 0:
|
|
||||||
case 1:
|
case 1:
|
||||||
|
/* Clear speed cruise mode bits */
|
||||||
data->pwm_fcms[0] &= ~(1 << index);
|
data->pwm_fcms[0] &= ~(1 << index);
|
||||||
w83795_write(client, W83795_REG_FCMS1, data->pwm_fcms[0]);
|
w83795_write(client, W83795_REG_FCMS1, data->pwm_fcms[0]);
|
||||||
|
/* Clear thermal cruise mode bits */
|
||||||
for (i = 0; i < 6; i++) {
|
for (i = 0; i < 6; i++) {
|
||||||
data->pwm_tfmr[i] &= ~(1 << index);
|
data->pwm_tfmr[i] &= ~(1 << index);
|
||||||
w83795_write(client, W83795_REG_TFMR(i),
|
w83795_write(client, W83795_REG_TFMR(i),
|
||||||
data->pwm_tfmr[i]);
|
data->pwm_tfmr[i]);
|
||||||
}
|
}
|
||||||
data->pwm_fomc |= 1 << index;
|
|
||||||
data->pwm_fomc ^= val << index;
|
|
||||||
w83795_write(client, W83795_REG_FOMC, data->pwm_fomc);
|
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
data->pwm_fcms[0] |= (1 << index);
|
data->pwm_fcms[0] |= (1 << index);
|
||||||
|
|
Loading…
Reference in a new issue