diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-25 10:20:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-25 10:20:36 -0700 |
commit | f016a6441a18000d5918ee3e05d9bdd4d53fed1c (patch) | |
tree | fbbbde8a52f572c15795a768897fd2f366b02317 /Documentation | |
parent | 0e37c275426c34712d4661d86c375779f3836a7e (diff) | |
parent | ead82d6792ef5c600d535bca6ec50a4da14ff7c7 (diff) | |
download | linux-f016a6441a18000d5918ee3e05d9bdd4d53fed1c.tar.bz2 |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull hwmon subsystem fixes from Jean Delvare.
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: (ntc_thermistor) Fix OF device ID mapping
hwmon: (ntc_thermistor) Fix dependencies
hwmon: Document temp[1-*]_min_hyst sysfs attribute
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/hwmon/sysfs-interface | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface index 79f8257dd790..2cc95ad46604 100644 --- a/Documentation/hwmon/sysfs-interface +++ b/Documentation/hwmon/sysfs-interface @@ -327,6 +327,13 @@ temp[1-*]_max_hyst from the max value. RW +temp[1-*]_min_hyst + Temperature hysteresis value for min limit. + Unit: millidegree Celsius + Must be reported as an absolute temperature, NOT a delta + from the min value. + RW + temp[1-*]_input Temperature input value. Unit: millidegree Celsius RO @@ -362,6 +369,13 @@ temp[1-*]_lcrit Temperature critical min value, typically lower than Unit: millidegree Celsius RW +temp[1-*]_lcrit_hyst + Temperature hysteresis value for critical min limit. + Unit: millidegree Celsius + Must be reported as an absolute temperature, NOT a delta + from the critical min value. + RW + temp[1-*]_offset Temperature offset which is added to the temperature reading by the chip. |