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>

diff --git a/Documentation/hwmon/k10temp b/Documentation/hwmon/k10temp
index 90956b6180254915e9ff17bb968729c20e043369..4dfdc8f836334e97881a6a92373d7702ad2111a8 100644 (file)
--- a/Documentation/hwmon/k10temp
+++ b/Documentation/hwmon/k10temp
@@ -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 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
 
   Prefix: 'k10temp'
   Addresses scanned: PCI space

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 47b3e5821cb8bc070aa49f3257e663d6e4ec6173..0ff09d8d987beb02c165bde92678a0f4ba49229f 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -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,
          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.
 
          This driver can also be built as a module.  If so, the module
          will be called k10temp.

diff --git a/drivers/hwmon/k10temp.c b/drivers/hwmon/k10temp.c
index e3b037c73a7eef2ce54249a99564e12d63690a26..e633856370cf403247d5a44152f776fc39e56241 100644 (file)
--- a/drivers/hwmon/k10temp.c
+++ b/drivers/hwmon/k10temp.c
@@ -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>
  *
  *
  * Copyright (c) 2009 Clemens Ladisch <clemens@ladisch.de>
  *


@@ -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_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);
        {}
 };
 MODULE_DEVICE_TABLE(pci, k10temp_id_table);