1 files changed, 69 insertions, 8 deletions

diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index 48ceabedf55d..8f63c244f1aa 100644
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -187,6 +187,17 @@ fan[1-*]_div	Fan divisor.
                 Note that this is actually an internal clock divisor, which
                 affects the measurable speed range, not the read value.
 
+fan[1-*]_pulses Number of tachometer pulses per fan revolution.
+                Integer value, typically between 1 and 4.
+                RW
+                This value is a characteristic of the fan connected to the
+                device's input, so it has to be set in accordance with the fan
+                model.
+                Should only be created if the chip has a register to configure
+                the number of pulses. In the absence of such a register (and
+                thus attribute) the value assumed by all devices is 2 pulses
+                per fan revolution.
+
 fan[1-*]_target
                 Desired fan speed
                 Unit: revolution/min (RPM)
@@ -309,6 +320,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
@@ -370,10 +395,20 @@ curr[1-*]_min	Current min value.
                 Unit: milliampere
                 RW
 
+curr[1-*]_lcrit Current critical low value
+                Unit: milliampere
+                RW
+
+curr[1-*]_crit  Current critical high value.
+                Unit: milliampere
+                RW
+
 curr[1-*]_input Current input value
                 Unit: milliampere
                 RO
 
+Also see the Alarms section for status flags associated with currents.
+
 *********
 * Power *
 *********
@@ -436,13 +471,6 @@ power[1-*]_accuracy		Accuracy of the power meter.
                                 Unit: Percent
                                 RO
 
-power[1-*]_alarm                1 if the system is drawing more power than the
-                                cap allows; 0 otherwise.  A poll notification is
-                                sent to this file when the power use exceeds the
-                                cap.  This file only appears if the cap is known
-                                to be enforced by hardware.
-                                RO
-
 power[1-*]_cap                  If power use rises above this limit, the
                                 system should take action to reduce power use.
                                 A poll notification is sent to this file if the
@@ -465,6 +493,20 @@ power[1-*]_cap_min		Minimum cap that can be set.
                                 Unit: microWatt
                                 RO
 
+power[1-*]_max                  Maximum power.
+                                Unit: microWatt
+                                RW
+
+power[1-*]_crit                 Critical maximum power.
+                                If power rises to or above this limit, the
+                                system is expected take drastic action to reduce
+                                power consumption, such as a system shutdown or
+                                a forced powerdown of some devices.
+                                Unit: microWatt
+                                RW
+
+Also see the Alarms section for status flags associated with power readings.
+
 **********
 * Energy *
 **********
@@ -474,6 +516,15 @@ energy[1-*]_input		Cumulative energy use
                                 RO
 
 
+************
+* Humidity *
+************
+
+humidity[1-*]_input             Humidity
+                                Unit: milli-percent (per cent mille, pcm)
+                                RO
+
+
 **********
 * Alarms *
 **********
@@ -487,6 +538,7 @@ implementation.
 
 in[0-*]_alarm
 curr[1-*]_alarm
+power[1-*]_alarm
 fan[1-*]_alarm
 temp[1-*]_alarm
                 Channel alarm
@@ -498,13 +550,22 @@ OR
 
 in[0-*]_min_alarm
 in[0-*]_max_alarm
+in[0-*]_lcrit_alarm
+in[0-*]_crit_alarm
 curr[1-*]_min_alarm
 curr[1-*]_max_alarm
+curr[1-*]_lcrit_alarm
+curr[1-*]_crit_alarm
+power[1-*]_cap_alarm
+power[1-*]_max_alarm
+power[1-*]_crit_alarm
 fan[1-*]_min_alarm
 fan[1-*]_max_alarm
 temp[1-*]_min_alarm
 temp[1-*]_max_alarm
+temp[1-*]_lcrit_alarm
 temp[1-*]_crit_alarm
+temp[1-*]_emergency_alarm
                 Limit alarm
                 0: no alarm
                 1: alarm
@@ -518,7 +579,7 @@ channel should not be trusted.
 fan[1-*]_fault
 temp[1-*]_fault
                 Input fault condition
-                0: no fault occured
+                0: no fault occurred
                 1: fault condition
                 RO