Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / Documentation / hwmon / sysfs-interface

diff --git a/Documentation/hwmon/sysfs-interface b/Documentation/hwmon/sysfs-interface
index efef3b962cd3eb86f586e811b77ad7b6eadee648..a9a18ad0d17ab6c17be017615602827320ee93e5 100644 (file)
--- a/Documentation/hwmon/sysfs-interface
+++ b/Documentation/hwmon/sysfs-interface
@@ -152,6 +152,13 @@ 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-*]_target
+               Desired fan speed
+               Unit: revolution/min (RPM)
+               RW
+               Only makes sense if the chip supports closed-loop fan speed
+               control based on the measured fan speed.
+
 Also see the Alarms section for status flags associated with fans.
 
 
@@ -166,16 +173,21 @@ pwm[1-*]  Pulse width modulation fan control.
 
 pwm[1-*]_enable
                Switch PWM on and off.
-               Not always present even if fan*_pwm is.
+               Not always present even if pwmN is.
                0: turn off
                1: turn on in manual mode
                2+: turn on in automatic mode
-               Check individual chip documentation files for automatic mode details.
+               Check individual chip documentation files for automatic mode
+               details.
+               RW
+
+pwm[1-*]_mode  0: DC mode (direct current)
+               1: PWM mode (pulse-width modulation)
                RW
 
-pwm[1-*]_mode
-               0: DC mode
-               1: PWM mode
+pwm[1-*]_freq  Base PWM frequency in Hz.
+               Only possibly available when pwmN_mode is PWM, but not always
+               present even then.
                RW
 
 pwm[1-*]_auto_channels_temp