aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/hwmon/k8temp13
-rw-r--r--MAINTAINERS6
-rw-r--r--drivers/hwmon/Kconfig6
3 files changed, 18 insertions, 7 deletions
diff --git a/Documentation/hwmon/k8temp b/Documentation/hwmon/k8temp
index bab445ab0f52..30d123b8d920 100644
--- a/Documentation/hwmon/k8temp
+++ b/Documentation/hwmon/k8temp
@@ -2,7 +2,7 @@ Kernel driver k8temp
2==================== 2====================
3 3
4Supported chips: 4Supported chips:
5 * AMD K8 CPU 5 * AMD Athlon64/FX or Opteron CPUs
6 Prefix: 'k8temp' 6 Prefix: 'k8temp'
7 Addresses scanned: PCI space 7 Addresses scanned: PCI space
8 Datasheet: http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf 8 Datasheet: http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf
@@ -13,10 +13,13 @@ Contact: Rudolf Marek <r.marek@sh.cvut.cz>
13Description 13Description
14----------- 14-----------
15 15
16This driver permits reading temperature sensor(s) embedded inside AMD K8 CPUs. 16This driver permits reading temperature sensor(s) embedded inside AMD K8
17Official documentation says that it works from revision F of K8 core, but 17family CPUs (Athlon64/FX, Opteron). Official documentation says that it works
18in fact it seems to be implemented for all revisions of K8 except the first 18from revision F of K8 core, but in fact it seems to be implemented for all
19two revisions (SH-B0 and SH-B3). 19revisions of K8 except the first two revisions (SH-B0 and SH-B3).
20
21Please note that you will need at least lm-sensors 2.10.1 for proper userspace
22support.
20 23
21There can be up to four temperature sensors inside single CPU. The driver 24There can be up to four temperature sensors inside single CPU. The driver
22will auto-detect the sensors and will display only temperatures from 25will auto-detect the sensors and will display only temperatures from
diff --git a/MAINTAINERS b/MAINTAINERS
index 5305dd69095b..595b34c4f9d8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1668,6 +1668,12 @@ M: sct@redhat.com, akpm@osdl.org
1668L: ext2-devel@lists.sourceforge.net 1668L: ext2-devel@lists.sourceforge.net
1669S: Maintained 1669S: Maintained
1670 1670
1671K8TEMP HARDWARE MONITORING DRIVER
1672P: Rudolf Marek
1673M: r.marek@assembler.cz
1674L: lm-sensors@lm-sensors.org
1675S: Maintained
1676
1671KCONFIG 1677KCONFIG
1672P: Roman Zippel 1678P: Roman Zippel
1673M: zippel@linux-m68k.org 1679M: zippel@linux-m68k.org
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e0dede7198c8..e76d91906c99 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -95,11 +95,13 @@ config SENSORS_ADM9240
95 will be called adm9240. 95 will be called adm9240.
96 96
97config SENSORS_K8TEMP 97config SENSORS_K8TEMP
98 tristate "AMD K8 processor sensor" 98 tristate "AMD Athlon64/FX or Opteron temperature sensor"
99 depends on HWMON && X86 && PCI && EXPERIMENTAL 99 depends on HWMON && X86 && PCI && EXPERIMENTAL
100 help 100 help
101 If you say yes here you get support for the temperature 101 If you say yes here you get support for the temperature
102 sensor(s) inside your AMD K8 CPU. 102 sensor(s) inside your CPU. Supported is whole AMD K8
103 microarchitecture. Please note that you will need at least
104 lm-sensors 2.10.1 for proper userspace support.
103 105
104 This driver can also be built as a module. If so, the module 106 This driver can also be built as a module. If so, the module
105 will be called k8temp. 107 will be called k8temp.