diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-11 12:45:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-11 12:45:55 -0500 |
| commit | 6102c315d896fb020550fb2481613485872978f6 (patch) | |
| tree | d0afc2dca7492c65be45af869b5988053bd92f2d /Documentation | |
| parent | a29815a333c6c6e677294bbe5958e771d0aad3fd (diff) | |
| parent | 3dd3a156355e7e6bec0dc9a0bbb6eeecbd965d50 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
hwmon: Make PCI device ids constant
hwmon: (coretemp) Fix TjMax for Atom N450/D410/D510 CPUs
hwmon: (k10temp) Blacklist more family 10h processors
hwmon: (asus_atk0110) Add debugfs interface
hwmon: (asus_atk0110) Refactor interface probe code
hwmon: (adt7462) Fix pin 28 monitoring
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/k10temp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp index a7a18d453a51..6526eee525a6 100644 --- a/Documentation/hwmon/k10temp +++ b/Documentation/hwmon/k10temp | |||
| @@ -3,8 +3,8 @@ Kernel driver k10temp | |||
| 3 | 3 | ||
| 4 | Supported chips: | 4 | Supported chips: |
| 5 | * AMD Family 10h processors: | 5 | * AMD Family 10h processors: |
| 6 | Socket F: Quad-Core/Six-Core/Embedded Opteron | 6 | Socket F: Quad-Core/Six-Core/Embedded Opteron (but see below) |
| 7 | Socket AM2+: Opteron, Phenom (II) X3/X4 | 7 | Socket AM2+: Quad-Core Opteron, Phenom (II) X3/X4, Athlon X2 (but see below) |
| 8 | Socket AM3: Quad-Core Opteron, Athlon/Phenom II X2/X3/X4, Sempron II | 8 | Socket AM3: Quad-Core Opteron, Athlon/Phenom II X2/X3/X4, Sempron II |
| 9 | Socket S1G3: Athlon II, Sempron, Turion II | 9 | Socket S1G3: Athlon II, Sempron, Turion II |
| 10 | * AMD Family 11h processors: | 10 | * AMD Family 11h processors: |
| @@ -36,10 +36,15 @@ Description | |||
| 36 | This driver permits reading of the internal temperature sensor of AMD | 36 | This driver permits reading of the internal temperature sensor of AMD |
| 37 | Family 10h and 11h processors. | 37 | Family 10h and 11h processors. |
| 38 | 38 | ||
| 39 | All these processors have a sensor, but on older revisions of Family 10h | 39 | All these processors have a sensor, but on those for Socket F or AM2+, |
| 40 | processors, the sensor may return inconsistent values (erratum 319). The | 40 | the sensor may return inconsistent values (erratum 319). The driver |
| 41 | driver will refuse to load on these revisions unless you specify the | 41 | will refuse to load on these revisions unless you specify the "force=1" |
| 42 | "force=1" module parameter. | 42 | module parameter. |
| 43 | |||
| 44 | Due to technical reasons, the driver can detect only the mainboard's | ||
| 45 | socket type, not the processor's actual capabilities. Therefore, if you | ||
| 46 | are using an AM3 processor on an AM2+ mainboard, you can safely use the | ||
| 47 | "force=1" parameter. | ||
| 43 | 48 | ||
| 44 | There is one temperature measurement value, available as temp1_input in | 49 | There is one temperature measurement value, available as temp1_input in |
| 45 | sysfs. It is measured in degrees Celsius with a resolution of 1/8th degree. | 50 | sysfs. It is measured in degrees Celsius with a resolution of 1/8th degree. |