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 d1d390aaf6205c8ac30d9ddb7c34813fca306d15..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.
 
                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.
 
 
 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.
 
 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
                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
 
                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
                RW
 
 pwm[1-*]_auto_channels_temp


@@ -208,12 +220,14 @@ temp[1-*]_auto_point[1-*]_temp_hyst
 ****************
 
 temp[1-*]_type Sensor type selection.
 ****************
 
 temp[1-*]_type Sensor type selection.

-               Integers 1 to 4 or thermistor Beta value (typically 3435)
+               Integers 1 to 6 or thermistor Beta value (typically 3435)

                RW
                1: PII/Celeron Diode
                2: 3904 transistor
                3: thermal diode
                4: thermistor (default/unknown Beta)
                RW
                1: PII/Celeron Diode
                2: 3904 transistor
                3: thermal diode
                4: thermistor (default/unknown Beta)

+               5: AMD AMDSI
+               6: Intel PECI

                Not all types are supported by all chips
 
 temp[1-*]_max  Temperature max value.
                Not all types are supported by all chips
 
 temp[1-*]_max  Temperature max value.