diff options
author | Wei Hu <wei@aristanetworks.com> | 2013-08-23 16:14:03 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2013-08-27 11:28:01 -0400 |
commit | 30b146d1cb5e7560192057098eb705118bd5511f (patch) | |
tree | 7e24c460ce599d3e4f6ea42231d69a4878f48abb /drivers/hwmon | |
parent | a4bf06d58f219230ee38e338fdda225973d44aa1 (diff) |
hwmon: (k10temp) Add support for Fam16h (Kabini)
The temperature reporting interface stays the same, so we just
add the PCI-ID to the list.
Verified on AMD Olive Hill.
Signed-off-by: Wei Hu <wei@aristanetworks.com>
Acked-by: Clemens Ladisch <clemens@ladisch.de>
Cc: stable@vger.kernel.org # 3.10+
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/Kconfig | 4 | ||||
-rw-r--r-- | drivers/hwmon/k10temp.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 47b3e5821cb8..0ff09d8d987b 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
@@ -296,8 +296,8 @@ config SENSORS_K10TEMP | |||
296 | If you say yes here you get support for the temperature | 296 | If you say yes here you get support for the temperature |
297 | sensor(s) inside your CPU. Supported are later revisions of | 297 | sensor(s) inside your CPU. Supported are later revisions of |
298 | the AMD Family 10h and all revisions of the AMD Family 11h, | 298 | the AMD Family 10h and all revisions of the AMD Family 11h, |
299 | 12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity) | 299 | 12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and |
300 | microarchitectures. | 300 | 16h (Kabini) microarchitectures. |
301 | 301 | ||
302 | This driver can also be built as a module. If so, the module | 302 | This driver can also be built as a module. If so, the module |
303 | will be called k10temp. | 303 | will be called k10temp. |
diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c index e3b037c73a7e..e633856370cf 100644 --- a/drivers/hwmon/k10temp.c +++ b/drivers/hwmon/k10temp.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * k10temp.c - AMD Family 10h/11h/12h/14h/15h processor hardware monitoring | 2 | * k10temp.c - AMD Family 10h/11h/12h/14h/15h/16h processor hardware monitoring |
3 | * | 3 | * |
4 | * Copyright (c) 2009 Clemens Ladisch <clemens@ladisch.de> | 4 | * Copyright (c) 2009 Clemens Ladisch <clemens@ladisch.de> |
5 | * | 5 | * |
@@ -211,6 +211,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = { | |||
211 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, | 211 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) }, |
212 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, | 212 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) }, |
213 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, | 213 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) }, |
214 | { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) }, | ||
214 | {} | 215 | {} |
215 | }; | 216 | }; |
216 | MODULE_DEVICE_TABLE(pci, k10temp_id_table); | 217 | MODULE_DEVICE_TABLE(pci, k10temp_id_table); |