Skip to content

Commit

Permalink
hwmon: (k10temp) Add support for Fam16h (Kabini)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wei Hu authored and groeck committed Aug 27, 2013
1 parent a4bf06d commit 30b146d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions Documentation/hwmon/k10temp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Supported chips:
* 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"

Prefix: 'k10temp'
Addresses scanned: PCI space
Expand Down
4 changes: 2 additions & 2 deletions drivers/hwmon/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -296,8 +296,8 @@ config SENSORS_K10TEMP
If you say yes here you get support for the temperature
sensor(s) inside your CPU. Supported are later revisions of
the AMD Family 10h and all revisions of the AMD Family 11h,
12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity)
microarchitectures.
12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and
16h (Kabini) microarchitectures.

This driver can also be built as a module. If so, the module
will be called k10temp.
Expand Down
3 changes: 2 additions & 1 deletion drivers/hwmon/k10temp.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* k10temp.c - AMD Family 10h/11h/12h/14h/15h processor hardware monitoring
* k10temp.c - AMD Family 10h/11h/12h/14h/15h/16h processor hardware monitoring
*
* Copyright (c) 2009 Clemens Ladisch <clemens@ladisch.de>
*
Expand Down Expand Up @@ -211,6 +211,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = {
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
{}
};
MODULE_DEVICE_TABLE(pci, k10temp_id_table);
Expand Down

0 comments on commit 30b146d

Please sign in to comment.