Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek...

[pandora-kernel.git] / Documentation / hwmon / sysfs-interface

diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index ff45d1f..6456990 100644 (file)
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -91,12 +91,11 @@ name                The chip name.
                I2C devices get this attribute created automatically.
                RO
 
-update_rate    The rate at which the chip will update readings.
+update_interval        The interval at which the chip will update readings.
                Unit: millisecond
                RW
-               Some devices have a variable update rate. This attribute
-               can be used to change the update rate to the desired
-               frequency.
+               Some devices have a variable update rate or interval.
+               This attribute can be used to change it to the desired value.
 
 
 ************
@@ -310,6 +309,20 @@ temp[1-*]_crit_hyst
                from the critical value.
                RW
 
+temp[1-*]_emergency
+               Temperature emergency max value, for chips supporting more than
+               two upper temperature limits. Must be equal or greater than
+               corresponding temp_crit values.
+               Unit: millidegree Celsius
+               RW
+
+temp[1-*]_emergency_hyst
+               Temperature hysteresis value for emergency limit.
+               Unit: millidegree Celsius
+               Must be reported as an absolute temperature, NOT a delta
+               from the emergency value.
+               RW
+
 temp[1-*]_lcrit        Temperature critical min value, typically lower than
                corresponding temp_min values.
                Unit: millidegree Celsius
@@ -506,6 +519,7 @@ fan[1-*]_max_alarm
 temp[1-*]_min_alarm
 temp[1-*]_max_alarm
 temp[1-*]_crit_alarm
+temp[1-*]_emergency_alarm
                Limit alarm
                0: no alarm
                1: alarm