diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 17:57:03 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-01-22 17:57:03 +0100 |
| commit | 79d26287021d3158e3cb8da820f1b8233564dd3b (patch) | |
| tree | 484d82e528c2e7326b26b3ed8910babe2b892595 /Documentation | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6 (diff) | |
| parent | hwmon/w83793: Hide invalid VID readings (diff) | |
| download | linux-79d26287021d3158e3cb8da820f1b8233564dd3b.tar.xz linux-79d26287021d3158e3cb8da820f1b8233564dd3b.zip | |
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
hwmon/w83793: Hide invalid VID readings
hwmon/w83793: Fix the fan input detection
hwmon/w83793: Ignore disabled temperature channels
hwmon: Fix the VRD 11 decoding
hwmon/w83793: Remove the description of AMDSI and update the voltage formula
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/w83793 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Documentation/hwmon/w83793 b/Documentation/hwmon/w83793 index 45e5408340e0..51171a83165b 100644 --- a/Documentation/hwmon/w83793 +++ b/Documentation/hwmon/w83793 @@ -45,18 +45,14 @@ This driver implements support for Winbond W83793G/W83793R chips. temp5-6 have a 1 degree Celsiis resolution. * Temperature sensor types - Temp1-4 have 3 possible types. It can be read from (and written to) + Temp1-4 have 2 possible types. It can be read from (and written to) temp[1-4]_type. - - If the value of 0, the related temperature channel stops - monitoring. - If the value is 3, it starts monitoring using a remote termal diode (default). - - If the value is 5, it starts monitoring using the temperature sensor - in AMD CPU and get result by AMDSI. - If the value is 6, it starts monitoring using the temperature sensor in Intel CPU and get result by PECI. Temp5-6 can be connected to external thermistors (value of - temp[5-6]_type is 4). They can also be disabled (value is 0). + temp[5-6]_type is 4). * Alarm mechanism For voltage sensors, an alarm triggers if the measured value is below |