diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 16:53:37 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-03 16:53:37 -0700 |
| commit | 3cf59142bcd391680beb6932838fe09a73947705 (patch) | |
| tree | 4067c594861e86b6000e83e4b34c75d210093621 /Documentation | |
| parent | 154d6f18a48e00dec2dc84a96914fe1a24669577 (diff) | |
| parent | ec0159503ae74aeb834e78366bdf4b9663ca1129 (diff) | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull second round of hwmon updates from Guenter Roeck:
"Add support for AMD F16 M30h processor to k10temp driver.
This adds one more patch which had secondary dependencies. The branch
point is arbitrary, but I did run a full set of build and qemu tests
on it. While there are some new build failures (6 out of 122 in my
builds), none are due to this commit"
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (k10temp) Add support for AMD F16 M30h processor
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/hwmon/k10temp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp index 4dfdc8f83633..ee6d30ec1522 100644 --- a/Documentation/hwmon/k10temp +++ b/Documentation/hwmon/k10temp @@ -11,8 +11,8 @@ Supported chips: Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra) * AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series) * AMD Family 14h processors: "Brazos" (C/E/G/Z-Series) -* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity" -* AMD Family 16h processors: "Kabini" +* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity", "Kaveri" +* AMD Family 16h processors: "Kabini", "Mullins" Prefix: 'k10temp' Addresses scanned: PCI space @@ -46,7 +46,7 @@ Description ----------- This driver permits reading of the internal temperature sensor of AMD -Family 10h/11h/12h/14h/15h processors. +Family 10h/11h/12h/14h/15h/16h processors. All these processors have a sensor, but on those for Socket F or AM2+, the sensor may return inconsistent values (erratum 319). The driver |