summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 12:45:48 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-29 12:45:48 -0400
commit92ddcf4a011a95dac98d3bbb0211a2fa42f13dc1 (patch)
treeac937fd7cc4d53542c5c299c85df09b1b87bf1c8 /Documentation
parent000a74f41e601bc4e36a760aa42f219a019c5391 (diff)
parent6445e6600fa632448cac64e71119310378464ad9 (diff)
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon update from Guenter Roeck: - New drivers for NCT6775, NCT6776, NCT6779, and LM95234. - Added support for LTC2974, LTC3883, LM25056, TMP431, TMP432, ADT7310, and ADT7320 to existing drivers. - Various code cleanups and minor improvements. * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (54 commits) hwmon: (nct6775) Fix coding style problems hwmon: (nct6775) Constify strings hwmon: (tmp401) Add support for TMP432 hwmon: (tmp401) Add support for update_interval attribute hwmon: (tmp401) Reset valid flag when resetting temperature history hwmon: (tmp401) Simplification and cleanup hwmon: (tmp401) Use sysfs_create_group / sysfs_remove_group hwmon: (tmp401) Drop unused defines, use BIT for bit masks hwmon: (nct6775) Use ARRAY_SIZE for loops where possible documentation: hwmon: Fix typo in documentation/hwmon hwmon: (nct6775) Enable both AUXTIN and VIN3 on NCT6776 hwmon: (ad7314) use spi_get_drvdata() and spi_set_drvdata() MAINTAINERS: Add myself as maintainer for the NCT6775 driver hwmon: (nct6775) Expand scope of supported chips hwmon: (gpio-fan) Use is_visible to determine if attributes should be created hwmon: (tmp401) Fix device detection for TMP411B and TMP411C hwmon: Add driver for LM95234 hwmon: (tmp401) Add support for TMP431 hwmon: (pmbus/lm25066) Add support for LM25056 hwmon: (pmbus/lm25066) Refactor device specific coefficients ...
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt29
-rw-r--r--Documentation/hwmon/adt741047
-rw-r--r--Documentation/hwmon/lm2506634
-rw-r--r--Documentation/hwmon/lm9523436
-rw-r--r--Documentation/hwmon/ltc2978143
-rw-r--r--Documentation/hwmon/nct6775188
-rw-r--r--Documentation/hwmon/sht152
-rw-r--r--Documentation/hwmon/tmp40125
-rw-r--r--Documentation/hwmon/zl61002
9 files changed, 415 insertions, 91 deletions
diff --git a/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt b/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt
new file mode 100644
index 000000000000..c6f66674f19c
--- /dev/null
+++ b/Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt
@@ -0,0 +1,29 @@
1NTC Thermistor hwmon sensors
2-------------------------------
3
4Requires node properties:
5- "compatible" value : one of
6 "ntc,ncp15wb473"
7 "ntc,ncp18wb473"
8 "ntc,ncp21wb473"
9 "ntc,ncp03wb473"
10 "ntc,ncp15wl333"
11- "pullup-uv" Pull up voltage in micro volts
12- "pullup-ohm" Pull up resistor value in ohms
13- "pulldown-ohm" Pull down resistor value in ohms
14- "connected-positive" Always ON, If not specified.
15 Status change is possible.
16- "io-channels" Channel node of ADC to be used for
17 conversion.
18
19Read more about iio bindings at
20 Documentation/devicetree/bindings/iio/iio-bindings.txt
21
22Example:
23 ncp15wb473@0 {
24 compatible = "ntc,ncp15wb473";
25 pullup-uv = <1800000>;
26 pullup-ohm = <47000>;
27 pulldown-ohm = <0>;
28 io-channels = <&adc 3>;
29 };
diff --git a/Documentation/hwmon/adt7410 b/Documentation/hwmon/adt7410
index 58150c480e56..9817941e5f19 100644
--- a/Documentation/hwmon/adt7410
+++ b/Documentation/hwmon/adt7410
@@ -12,29 +12,42 @@ Supported chips:
12 Addresses scanned: None 12 Addresses scanned: None
13 Datasheet: Publicly available at the Analog Devices website 13 Datasheet: Publicly available at the Analog Devices website
14 http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf 14 http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf
15 * Analog Devices ADT7310
16 Prefix: 'adt7310'
17 Addresses scanned: None
18 Datasheet: Publicly available at the Analog Devices website
19 http://www.analog.com/static/imported-files/data_sheets/ADT7310.pdf
20 * Analog Devices ADT7320
21 Prefix: 'adt7320'
22 Addresses scanned: None
23 Datasheet: Publicly available at the Analog Devices website
24 http://www.analog.com/static/imported-files/data_sheets/ADT7320.pdf
15 25
16Author: Hartmut Knaack <knaack.h@gmx.de> 26Author: Hartmut Knaack <knaack.h@gmx.de>
17 27
18Description 28Description
19----------- 29-----------
20 30
21The ADT7410 is a temperature sensor with rated temperature range of -55°C to 31The ADT7310/ADT7410 is a temperature sensor with rated temperature range of
22+150°C. It has a high accuracy of +/-0.5°C and can be operated at a resolution 32-55°C to +150°C. It has a high accuracy of +/-0.5°C and can be operated at a
23of 13 bits (0.0625°C) or 16 bits (0.0078°C). The sensor provides an INT pin to 33resolution of 13 bits (0.0625°C) or 16 bits (0.0078°C). The sensor provides an
24indicate that a minimum or maximum temperature set point has been exceeded, as 34INT pin to indicate that a minimum or maximum temperature set point has been
25well as a critical temperature (CT) pin to indicate that the critical 35exceeded, as well as a critical temperature (CT) pin to indicate that the
26temperature set point has been exceeded. Both pins can be set up with a common 36critical temperature set point has been exceeded. Both pins can be set up with a
27hysteresis of 0°C - 15°C and a fault queue, ranging from 1 to 4 events. Both 37common hysteresis of 0°C - 15°C and a fault queue, ranging from 1 to 4 events.
28pins can individually set to be active-low or active-high, while the whole 38Both pins can individually set to be active-low or active-high, while the whole
29device can either run in comparator mode or interrupt mode. The ADT7410 39device can either run in comparator mode or interrupt mode. The ADT7410 supports
30supports continous temperature sampling, as well as sampling one temperature 40continuous temperature sampling, as well as sampling one temperature value per
31value per second or even justget one sample on demand for power saving. 41second or even just get one sample on demand for power saving. Besides, it can
32Besides, it can completely power down its ADC, if power management is 42completely power down its ADC, if power management is required.
33required. 43
34 44The ADT7320/ADT7420 is register compatible, the only differences being the
35The ADT7420 is register compatible, the only differences being the package, 45package, a slightly narrower operating temperature range (-40°C to +150°C), and
36a slightly narrower operating temperature range (-40°C to +150°C), and a 46a better accuracy (0.25°C instead of 0.50°C.)
37better accuracy (0.25°C instead of 0.50°C.) 47
48The difference between the ADT7310/ADT7320 and ADT7410/ADT7420 is the control
49interface, the ADT7310 and ADT7320 use SPI while the ADT7410 and ADT7420 use
50I2C.
38 51
39Configuration Notes 52Configuration Notes
40------------------- 53-------------------
diff --git a/Documentation/hwmon/lm25066 b/Documentation/hwmon/lm25066
index 26025e419d35..c1b57d72efc3 100644
--- a/Documentation/hwmon/lm25066
+++ b/Documentation/hwmon/lm25066
@@ -1,7 +1,13 @@
1Kernel driver max8688 1Kernel driver lm25066
2===================== 2=====================
3 3
4Supported chips: 4Supported chips:
5 * TI LM25056
6 Prefix: 'lm25056'
7 Addresses scanned: -
8 Datasheets:
9 http://www.ti.com/lit/gpn/lm25056
10 http://www.ti.com/lit/gpn/lm25056a
5 * National Semiconductor LM25066 11 * National Semiconductor LM25066
6 Prefix: 'lm25066' 12 Prefix: 'lm25066'
7 Addresses scanned: - 13 Addresses scanned: -
@@ -25,8 +31,9 @@ Author: Guenter Roeck <linux@roeck-us.net>
25Description 31Description
26----------- 32-----------
27 33
28This driver supports hardware montoring for National Semiconductor LM25066, 34This driver supports hardware montoring for National Semiconductor / TI LM25056,
29LM5064, and LM5064 Power Management, Monitoring, Control, and Protection ICs. 35LM25066, LM5064, and LM5064 Power Management, Monitoring, Control, and
36Protection ICs.
30 37
31The driver is a client driver to the core PMBus driver. Please see 38The driver is a client driver to the core PMBus driver. Please see
32Documentation/hwmon/pmbus for details on PMBus client drivers. 39Documentation/hwmon/pmbus for details on PMBus client drivers.
@@ -60,14 +67,19 @@ in1_max Maximum input voltage.
60in1_min_alarm Input voltage low alarm. 67in1_min_alarm Input voltage low alarm.
61in1_max_alarm Input voltage high alarm. 68in1_max_alarm Input voltage high alarm.
62 69
63in2_label "vout1" 70in2_label "vmon"
64in2_input Measured output voltage. 71in2_input Measured voltage on VAUX pin
65in2_average Average measured output voltage. 72in2_min Minimum VAUX voltage (LM25056 only).
66in2_min Minimum output voltage. 73in2_max Maximum VAUX voltage (LM25056 only).
67in2_min_alarm Output voltage low alarm. 74in2_min_alarm VAUX voltage low alarm (LM25056 only).
68 75in2_max_alarm VAUX voltage high alarm (LM25056 only).
69in3_label "vout2" 76
70in3_input Measured voltage on vaux pin 77in3_label "vout1"
78 Not supported on LM25056.
79in3_input Measured output voltage.
80in3_average Average measured output voltage.
81in3_min Minimum output voltage.
82in3_min_alarm Output voltage low alarm.
71 83
72curr1_label "iin" 84curr1_label "iin"
73curr1_input Measured input current. 85curr1_input Measured input current.
diff --git a/Documentation/hwmon/lm95234 b/Documentation/hwmon/lm95234
new file mode 100644
index 000000000000..a0e95ddfd372
--- /dev/null
+++ b/Documentation/hwmon/lm95234
@@ -0,0 +1,36 @@
1Kernel driver lm95234
2=====================
3
4Supported chips:
5 * National Semiconductor / Texas Instruments LM95234
6 Addresses scanned: I2C 0x18, 0x4d, 0x4e
7 Datasheet: Publicly available at the Texas Instruments website
8 http://www.ti.com/product/lm95234
9
10
11Author: Guenter Roeck <linux@roeck-us.net>
12
13Description
14-----------
15
16LM95234 is an 11-bit digital temperature sensor with a 2-wire System Management
17Bus (SMBus) interface and TrueTherm technology that can very accurately monitor
18the temperature of four remote diodes as well as its own temperature.
19The four remote diodes can be external devices such as microprocessors,
20graphics processors or diode-connected 2N3904s. The LM95234's TruTherm
21beta compensation technology allows sensing of 90 nm or 65 nm process
22thermal diodes accurately.
23
24All temperature values are given in millidegrees Celsius. Temperature
25is provided within a range of -127 to +255 degrees (+127.875 degrees for
26the internal sensor). Resolution depends on temperature input and range.
27
28Each sensor has its own maximum limit, but the hysteresis is common to all
29channels. The hysteresis is configurable with the tem1_max_hyst attribute and
30affects the hysteresis on all channels. The first two external sensors also
31have a critical limit.
32
33The lm95234 driver can change its update interval to a fixed set of values.
34It will round up to the next selectable interval. See the datasheet for exact
35values. Reading sensor values more often will do no harm, but will return
36'old' values.
diff --git a/Documentation/hwmon/ltc2978 b/Documentation/hwmon/ltc2978
index e4d75c606c97..dc0d08c61305 100644
--- a/Documentation/hwmon/ltc2978
+++ b/Documentation/hwmon/ltc2978
@@ -2,6 +2,10 @@ Kernel driver ltc2978
2===================== 2=====================
3 3
4Supported chips: 4Supported chips:
5 * Linear Technology LTC2974
6 Prefix: 'ltc2974'
7 Addresses scanned: -
8 Datasheet: http://www.linear.com/product/ltc2974
5 * Linear Technology LTC2978 9 * Linear Technology LTC2978
6 Prefix: 'ltc2978' 10 Prefix: 'ltc2978'
7 Addresses scanned: - 11 Addresses scanned: -
@@ -10,6 +14,10 @@ Supported chips:
10 Prefix: 'ltc3880' 14 Prefix: 'ltc3880'
11 Addresses scanned: - 15 Addresses scanned: -
12 Datasheet: http://www.linear.com/product/ltc3880 16 Datasheet: http://www.linear.com/product/ltc3880
17 * Linear Technology LTC3883
18 Prefix: 'ltc3883'
19 Addresses scanned: -
20 Datasheet: http://www.linear.com/product/ltc3883
13 21
14Author: Guenter Roeck <linux@roeck-us.net> 22Author: Guenter Roeck <linux@roeck-us.net>
15 23
@@ -17,9 +25,9 @@ Author: Guenter Roeck <linux@roeck-us.net>
17Description 25Description
18----------- 26-----------
19 27
20The LTC2978 is an octal power supply monitor, supervisor, sequencer and 28LTC2974 is a quad digital power supply manager. LTC2978 is an octal power supply
21margin controller. The LTC3880 is a dual, PolyPhase DC/DC synchronous 29monitor. LTC3880 is a dual output poly-phase step-down DC/DC controller. LTC3883
22step-down switching regulator controller. 30is a single phase step-down DC/DC controller.
23 31
24 32
25Usage Notes 33Usage Notes
@@ -41,63 +49,90 @@ Sysfs attributes
41in1_label "vin" 49in1_label "vin"
42in1_input Measured input voltage. 50in1_input Measured input voltage.
43in1_min Minimum input voltage. 51in1_min Minimum input voltage.
44in1_max Maximum input voltage. 52in1_max Maximum input voltage. LTC2974 and LTC2978 only.
45in1_lcrit Critical minimum input voltage. 53in1_lcrit Critical minimum input voltage. LTC2974 and LTC2978
54 only.
46in1_crit Critical maximum input voltage. 55in1_crit Critical maximum input voltage.
47in1_min_alarm Input voltage low alarm. 56in1_min_alarm Input voltage low alarm.
48in1_max_alarm Input voltage high alarm. 57in1_max_alarm Input voltage high alarm. LTC2974 and LTC2978 only.
49in1_lcrit_alarm Input voltage critical low alarm. 58in1_lcrit_alarm Input voltage critical low alarm. LTC2974 and LTC2978
59 only.
50in1_crit_alarm Input voltage critical high alarm. 60in1_crit_alarm Input voltage critical high alarm.
51in1_lowest Lowest input voltage. LTC2978 only. 61in1_lowest Lowest input voltage. LTC2974 and LTC2978 only.
52in1_highest Highest input voltage. 62in1_highest Highest input voltage.
53in1_reset_history Reset history. Writing into this attribute will reset 63in1_reset_history Reset input voltage history.
54 history for all attributes. 64
55 65in[N]_label "vout[1-8]".
56in[2-9]_label "vout[1-8]". Channels 3 to 9 on LTC2978 only. 66 LTC2974: N=2-5
57in[2-9]_input Measured output voltage. 67 LTC2978: N=2-9
58in[2-9]_min Minimum output voltage. 68 LTC3880: N=2-3
59in[2-9]_max Maximum output voltage. 69 LTC3883: N=2
60in[2-9]_lcrit Critical minimum output voltage. 70in[N]_input Measured output voltage.
61in[2-9]_crit Critical maximum output voltage. 71in[N]_min Minimum output voltage.
62in[2-9]_min_alarm Output voltage low alarm. 72in[N]_max Maximum output voltage.
63in[2-9]_max_alarm Output voltage high alarm. 73in[N]_lcrit Critical minimum output voltage.
64in[2-9]_lcrit_alarm Output voltage critical low alarm. 74in[N]_crit Critical maximum output voltage.
65in[2-9]_crit_alarm Output voltage critical high alarm. 75in[N]_min_alarm Output voltage low alarm.
66in[2-9]_lowest Lowest output voltage. LTC2978 only. 76in[N]_max_alarm Output voltage high alarm.
67in[2-9]_highest Lowest output voltage. 77in[N]_lcrit_alarm Output voltage critical low alarm.
68in[2-9]_reset_history Reset history. Writing into this attribute will reset 78in[N]_crit_alarm Output voltage critical high alarm.
69 history for all attributes. 79in[N]_lowest Lowest output voltage. LTC2974 and LTC2978 only.
70 80in[N]_highest Highest output voltage.
71temp[1-3]_input Measured temperature. 81in[N]_reset_history Reset output voltage history.
82
83temp[N]_input Measured temperature.
84 On LTC2974, temp[1-4] report external temperatures,
85 and temp5 reports the chip temperature.
72 On LTC2978, only one temperature measurement is 86 On LTC2978, only one temperature measurement is
73 supported and reflects the internal temperature. 87 supported and reports the chip temperature.
74 On LTC3880, temp1 and temp2 report external 88 On LTC3880, temp1 and temp2 report external
75 temperatures, and temp3 reports the internal 89 temperatures, and temp3 reports the chip temperature.
76 temperature. 90 On LTC3883, temp1 reports an external temperature,
77temp[1-3]_min Mimimum temperature. 91 and temp2 reports the chip temperature.
78temp[1-3]_max Maximum temperature. 92temp[N]_min Mimimum temperature. LTC2974 and LTC2978 only.
79temp[1-3]_lcrit Critical low temperature. 93temp[N]_max Maximum temperature.
80temp[1-3]_crit Critical high temperature. 94temp[N]_lcrit Critical low temperature.
81temp[1-3]_min_alarm Chip temperature low alarm. 95temp[N]_crit Critical high temperature.
82temp[1-3]_max_alarm Chip temperature high alarm. 96temp[N]_min_alarm Temperature low alarm. LTC2974 and LTC2978 only.
83temp[1-3]_lcrit_alarm Chip temperature critical low alarm. 97temp[N]_max_alarm Temperature high alarm.
84temp[1-3]_crit_alarm Chip temperature critical high alarm. 98temp[N]_lcrit_alarm Temperature critical low alarm.
85temp[1-3]_lowest Lowest measured temperature. LTC2978 only. 99temp[N]_crit_alarm Temperature critical high alarm.
86temp[1-3]_highest Highest measured temperature. 100temp[N]_lowest Lowest measured temperature. LTC2974 and LTC2978 only.
87temp[1-3]_reset_history Reset history. Writing into this attribute will reset 101 Not supported for chip temperature sensor on LTC2974.
88 history for all attributes. 102temp[N]_highest Highest measured temperature. Not supported for chip
89 103 temperature sensor on LTC2974.
90power[1-2]_label "pout[1-2]". LTC3880 only. 104temp[N]_reset_history Reset temperature history. Not supported for chip
91power[1-2]_input Measured power. 105 temperature sensor on LTC2974.
92 106
93curr1_label "iin". LTC3880 only. 107power1_label "pin". LTC3883 only.
108power1_input Measured input power.
109
110power[N]_label "pout[1-4]".
111 LTC2974: N=1-4
112 LTC2978: Not supported
113 LTC3880: N=1-2
114 LTC3883: N=2
115power[N]_input Measured output power.
116
117curr1_label "iin". LTC3880 and LTC3883 only.
94curr1_input Measured input current. 118curr1_input Measured input current.
95curr1_max Maximum input current. 119curr1_max Maximum input current.
96curr1_max_alarm Input current high alarm. 120curr1_max_alarm Input current high alarm.
97 121curr1_highest Highest input current. LTC3883 only.
98curr[2-3]_label "iout[1-2]". LTC3880 only. 122curr1_reset_history Reset input current history. LTC3883 only.
99curr[2-3]_input Measured input current. 123
100curr[2-3]_max Maximum input current. 124curr[N]_label "iout[1-4]".
101curr[2-3]_crit Critical input current. 125 LTC2974: N=1-4
102curr[2-3]_max_alarm Input current high alarm. 126 LTC2978: not supported
103curr[2-3]_crit_alarm Input current critical high alarm. 127 LTC3880: N=2-3
128 LTC3883: N=2
129curr[N]_input Measured output current.
130curr[N]_max Maximum output current.
131curr[N]_crit Critical high output current.
132curr[N]_lcrit Critical low output current. LTC2974 only.
133curr[N]_max_alarm Output current high alarm.
134curr[N]_crit_alarm Output current critical high alarm.
135curr[N]_lcrit_alarm Output current critical low alarm. LTC2974 only.
136curr[N]_lowest Lowest output current. LTC2974 only.
137curr[N]_highest Highest output current.
138curr[N]_reset_history Reset output current history.
diff --git a/Documentation/hwmon/nct6775 b/Documentation/hwmon/nct6775
new file mode 100644
index 000000000000..4e9ef60e8c6c
--- /dev/null
+++ b/Documentation/hwmon/nct6775
@@ -0,0 +1,188 @@
1Note
2====
3
4This driver supersedes the NCT6775F and NCT6776F support in the W83627EHF
5driver.
6
7Kernel driver NCT6775
8=====================
9
10Supported chips:
11 * Nuvoton NCT5572D/NCT6771F/NCT6772F/NCT6775F/W83677HG-I
12 Prefix: 'nct6775'
13 Addresses scanned: ISA address retrieved from Super I/O registers
14 Datasheet: Available from Nuvoton upon request
15 * Nuvoton NCT5577D/NCT6776D/NCT6776F
16 Prefix: 'nct6776'
17 Addresses scanned: ISA address retrieved from Super I/O registers
18 Datasheet: Available from Nuvoton upon request
19 * Nuvoton NCT5532D/NCT6779D
20 Prefix: 'nct6779'
21 Addresses scanned: ISA address retrieved from Super I/O registers
22 Datasheet: Available from Nuvoton upon request
23
24Authors:
25 Guenter Roeck <linux@roeck-us.net>
26
27Description
28-----------
29
30This driver implements support for the Nuvoton NCT6775F, NCT6776F, and NCT6779D
31and compatible super I/O chips.
32
33The chips support up to 25 temperature monitoring sources. Up to 6 of those are
34direct temperature sensor inputs, the others are special sources such as PECI,
35PCH, and SMBUS. Depending on the chip type, 2 to 6 of the temperature sources
36can be monitored and compared against minimum, maximum, and critical
37temperatures. The driver reports up to 10 of the temperatures to the user.
38There are 4 to 5 fan rotation speed sensors, 8 to 15 analog voltage sensors,
39one VID, alarms with beep warnings (control unimplemented), and some automatic
40fan regulation strategies (plus manual fan control mode).
41
42The temperature sensor sources on all chips are configurable. The configured
43source for each of the temperature sensors is provided in tempX_label.
44
45Temperatures are measured in degrees Celsius and measurement resolution is
46either 1 degC or 0.5 degC, depending on the temperature source and
47configuration. An alarm is triggered when the temperature gets higher than
48the high limit; it stays on until the temperature falls below the hysteresis
49value. Alarms are only supported for temp1 to temp6, depending on the chip type.
50
51Fan rotation speeds are reported in RPM (rotations per minute). An alarm is
52triggered if the rotation speed has dropped below a programmable limit. On
53NCT6775F, fan readings can be divided by a programmable divider (1, 2, 4, 8,
5416, 32, 64 or 128) to give the readings more range or accuracy; the other chips
55do not have a fan speed divider. The driver sets the most suitable fan divisor
56itself; specifically, it increases the divider value each time a fan speed
57reading returns an invalid value, and it reduces it if the fan speed reading
58is lower than optimal. Some fans might not be present because they share pins
59with other functions.
60
61Voltage sensors (also known as IN sensors) report their values in millivolts.
62An alarm is triggered if the voltage has crossed a programmable minimum
63or maximum limit.
64
65The driver supports automatic fan control mode known as Thermal Cruise.
66In this mode, the chip attempts to keep the measured temperature in a
67predefined temperature range. If the temperature goes out of range, fan
68is driven slower/faster to reach the predefined range again.
69
70The mode works for fan1-fan5.
71
72sysfs attributes
73----------------
74
75pwm[1-5] - this file stores PWM duty cycle or DC value (fan speed) in range:
76 0 (lowest speed) to 255 (full)
77
78pwm[1-5]_enable - this file controls mode of fan/temperature control:
79 * 0 Fan control disabled (fans set to maximum speed)
80 * 1 Manual mode, write to pwm[0-5] any value 0-255
81 * 2 "Thermal Cruise" mode
82 * 3 "Fan Speed Cruise" mode
83 * 4 "Smart Fan III" mode (NCT6775F only)
84 * 5 "Smart Fan IV" mode
85
86pwm[1-5]_mode - controls if output is PWM or DC level
87 * 0 DC output
88 * 1 PWM output
89
90Common fan control attributes
91-----------------------------
92
93pwm[1-5]_temp_sel Temperature source. Value is temperature sensor index.
94 For example, select '1' for temp1_input.
95pwm[1-5]_weight_temp_sel
96 Secondary temperature source. Value is temperature
97 sensor index. For example, select '1' for temp1_input.
98 Set to 0 to disable secondary temperature control.
99
100If secondary temperature functionality is enabled, it is controlled with the
101following attributes.
102
103pwm[1-5]_weight_duty_step
104 Duty step size.
105pwm[1-5]_weight_temp_step
106 Temperature step size. With each step over
107 temp_step_base, the value of weight_duty_step is added
108 to the current pwm value.
109pwm[1-5]_weight_temp_step_base
110 Temperature at which secondary temperature control kicks
111 in.
112pwm[1-5]_weight_temp_step_tol
113 Temperature step tolerance.
114
115Thermal Cruise mode (2)
116-----------------------
117
118If the temperature is in the range defined by:
119
120pwm[1-5]_target_temp Target temperature, unit millidegree Celsius
121 (range 0 - 127000)
122pwm[1-5]_temp_tolerance
123 Target temperature tolerance, unit millidegree Celsius
124
125there are no changes to fan speed. Once the temperature leaves the interval, fan
126speed increases (if temperature is higher that desired) or decreases (if
127temperature is lower than desired), using the following limits and time
128intervals.
129
130pwm[1-5]_start fan pwm start value (range 1 - 255), to start fan
131 when the temperature is above defined range.
132pwm[1-5]_floor lowest fan pwm (range 0 - 255) if temperature is below
133 the defined range. If set to 0, the fan is expected to
134 stop if the temperature is below the defined range.
135pwm[1-5]_step_up_time milliseconds before fan speed is increased
136pwm[1-5]_step_down_time milliseconds before fan speed is decreased
137pwm[1-5]_stop_time how many milliseconds must elapse to switch
138 corresponding fan off (when the temperature was below
139 defined range).
140
141Speed Cruise mode (3)
142---------------------
143
144This modes tries to keep the fan speed constant.
145
146fan[1-5]_target Target fan speed
147fan[1-5]_tolerance
148 Target speed tolerance
149
150
151Untested; use at your own risk.
152
153Smart Fan IV mode (5)
154---------------------
155
156This mode offers multiple slopes to control the fan speed. The slopes can be
157controlled by setting the pwm and temperature attributes. When the temperature
158rises, the chip will calculate the DC/PWM output based on the current slope.
159There are up to seven data points depending on the chip type. Subsequent data
160points should be set to higher temperatures and higher pwm values to achieve
161higher fan speeds with increasing temperature. The last data point reflects
162critical temperature mode, in which the fans should run at full speed.
163
164pwm[1-5]_auto_point[1-7]_pwm
165 pwm value to be set if temperature reaches matching
166 temperature range.
167pwm[1-5]_auto_point[1-7]_temp
168 Temperature over which the matching pwm is enabled.
169pwm[1-5]_temp_tolerance
170 Temperature tolerance, unit millidegree Celsius
171pwm[1-5]_crit_temp_tolerance
172 Temperature tolerance for critical temperature,
173 unit millidegree Celsius
174
175pwm[1-5]_step_up_time milliseconds before fan speed is increased
176pwm[1-5]_step_down_time milliseconds before fan speed is decreased
177
178Usage Notes
179-----------
180
181On various ASUS boards with NCT6776F, it appears that CPUTIN is not really
182connected to anything and floats, or that it is connected to some non-standard
183temperature measurement device. As a result, the temperature reported on CPUTIN
184will not reflect a usable value. It often reports unreasonably high
185temperatures, and in some cases the reported temperature declines if the actual
186temperature increases (similar to the raw PECI temperature value - see PECI
187specification for details). CPUTIN should therefore be be ignored on ASUS
188boards. The CPU temperature on ASUS boards is reported from PECI 0.
diff --git a/Documentation/hwmon/sht15 b/Documentation/hwmon/sht15
index 02850bdfac18..778987d1856f 100644
--- a/Documentation/hwmon/sht15
+++ b/Documentation/hwmon/sht15
@@ -40,7 +40,7 @@ bits for humidity, or 12 bits for temperature and 8 bits for humidity.
40The humidity calibration coefficients are programmed into an OTP memory on the 40The humidity calibration coefficients are programmed into an OTP memory on the
41chip. These coefficients are used to internally calibrate the signals from the 41chip. These coefficients are used to internally calibrate the signals from the
42sensors. Disabling the reload of those coefficients allows saving 10ms for each 42sensors. Disabling the reload of those coefficients allows saving 10ms for each
43measurement and decrease power consumption, while loosing on precision. 43measurement and decrease power consumption, while losing on precision.
44 44
45Some options may be set directly in the sht15_platform_data structure 45Some options may be set directly in the sht15_platform_data structure
46or via sysfs attributes. 46or via sysfs attributes.
diff --git a/Documentation/hwmon/tmp401 b/Documentation/hwmon/tmp401
index 9fc447249212..f91e3fa7e5ec 100644
--- a/Documentation/hwmon/tmp401
+++ b/Documentation/hwmon/tmp401
@@ -8,8 +8,16 @@ Supported chips:
8 Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp401.html 8 Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp401.html
9 * Texas Instruments TMP411 9 * Texas Instruments TMP411
10 Prefix: 'tmp411' 10 Prefix: 'tmp411'
11 Addresses scanned: I2C 0x4c 11 Addresses scanned: I2C 0x4c, 0x4d, 0x4e
12 Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp411.html 12 Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp411.html
13 * Texas Instruments TMP431
14 Prefix: 'tmp431'
15 Addresses scanned: I2C 0x4c, 0x4d
16 Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp431.html
17 * Texas Instruments TMP432
18 Prefix: 'tmp432'
19 Addresses scanned: I2C 0x4c, 0x4d
20 Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp432.html
13 21
14Authors: 22Authors:
15 Hans de Goede <hdegoede@redhat.com> 23 Hans de Goede <hdegoede@redhat.com>
@@ -18,19 +26,19 @@ Authors:
18Description 26Description
19----------- 27-----------
20 28
21This driver implements support for Texas Instruments TMP401 and 29This driver implements support for Texas Instruments TMP401, TMP411,
22TMP411 chips. These chips implements one remote and one local 30TMP431, and TMP432 chips. These chips implement one or two remote and
23temperature sensor. Temperature is measured in degrees 31one local temperature sensors. Temperature is measured in degrees
24Celsius. Resolution of the remote sensor is 0.0625 degree. Local 32Celsius. Resolution of the remote sensor is 0.0625 degree. Local
25sensor resolution can be set to 0.5, 0.25, 0.125 or 0.0625 degree (not 33sensor resolution can be set to 0.5, 0.25, 0.125 or 0.0625 degree (not
26supported by the driver so far, so using the default resolution of 0.5 34supported by the driver so far, so using the default resolution of 0.5
27degree). 35degree).
28 36
29The driver provides the common sysfs-interface for temperatures (see 37The driver provides the common sysfs-interface for temperatures (see
30/Documentation/hwmon/sysfs-interface under Temperatures). 38Documentation/hwmon/sysfs-interface under Temperatures).
31 39
32The TMP411 chip is compatible with TMP401. It provides some additional 40The TMP411 and TMP431 chips are compatible with TMP401. TMP411 provides
33features. 41some additional features.
34 42
35* Minimum and Maximum temperature measured since power-on, chip-reset 43* Minimum and Maximum temperature measured since power-on, chip-reset
36 44
@@ -40,3 +48,6 @@ features.
40 48
41 Exported via sysfs attribute temp_reset_history. Writing 1 to this 49 Exported via sysfs attribute temp_reset_history. Writing 1 to this
42 file triggers a reset. 50 file triggers a reset.
51
52TMP432 is compatible with TMP401 and TMP431. It supports two external
53temperature sensors.
diff --git a/Documentation/hwmon/zl6100 b/Documentation/hwmon/zl6100
index 756b57c6b73e..33908a4d68ff 100644
--- a/Documentation/hwmon/zl6100
+++ b/Documentation/hwmon/zl6100
@@ -125,7 +125,7 @@ in2_label "vmon"
125in2_input Measured voltage on VMON (ZL2004) or VDRV (ZL9101M, 125in2_input Measured voltage on VMON (ZL2004) or VDRV (ZL9101M,
126 ZL9117M) pin. Reported voltage is 16x the voltage on the 126 ZL9117M) pin. Reported voltage is 16x the voltage on the
127 pin (adjusted internally by the chip). 127 pin (adjusted internally by the chip).
128in2_lcrit Critical minumum VMON/VDRV Voltage. 128in2_lcrit Critical minimum VMON/VDRV Voltage.
129in2_crit Critical maximum VMON/VDRV voltage. 129in2_crit Critical maximum VMON/VDRV voltage.
130in2_lcrit_alarm VMON/VDRV voltage critical low alarm. 130in2_lcrit_alarm VMON/VDRV voltage critical low alarm.
131in2_crit_alarm VMON/VDRV voltage critical high alarm. 131in2_crit_alarm VMON/VDRV voltage critical high alarm.