diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-30 18:04:19 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-30 18:04:19 +0300 |
| commit | 0a552051a467a544135448905cf42e6e78d1a6c0 (patch) | |
| tree | 07a45c1b08bfd1c8fca06b53ca2db4f6e470bdf0 /Documentation | |
| parent | d41a83ba4bdcbe9d0a29cee4acb8dda7aa19b6d6 (diff) | |
| parent | 9200bc4c28cd8992eb5379345abd6b4f0c93df16 (diff) | |
| download | linux-0a552051a467a544135448905cf42e6e78d1a6c0.tar.xz | |
Merge tag 'hwmon-for-linus-v4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Two patches headed for -stable.
nct7802: Fix integer overflow seen when writing voltage limits
nct7904: Rename pwm attributes to match hwmon ABI"
* tag 'hwmon-for-linus-v4.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (nct7802) Fix integer overflow seen when writing voltage limits
hwmon: (nct7904) Rename pwm attributes to match hwmon ABI
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/nct7904 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/hwmon/nct7904 b/Documentation/hwmon/nct7904 index 014f112e2a14..57fffe33ebfc 100644 --- a/Documentation/hwmon/nct7904 +++ b/Documentation/hwmon/nct7904 @@ -35,11 +35,11 @@ temp1_input Local temperature (1/1000 degree, temp[2-9]_input CPU temperatures (1/1000 degree, 0.125 degree resolution) -fan[1-4]_mode R/W, 0/1 for manual or SmartFan mode +pwm[1-4]_enable R/W, 1/2 for manual or SmartFan mode Setting SmartFan mode is supported only if it has been previously configured by BIOS (or configuration EEPROM) -fan[1-4]_pwm R/O in SmartFan mode, R/W in manual control mode +pwm[1-4] R/O in SmartFan mode, R/W in manual control mode The driver checks sensor control registers and does not export the sensors that are not enabled. Anyway, a sensor that is enabled may actually be not |