releases/3.0.57/x86-amd-power-driver-support-for-amd-s-family-16h-processors.patch

   1 From 22e32f4f57778ebc6e17812fa3008361c05d64f9 Mon Sep 17 00:00:00 2001
   2 From: Boris Ostrovsky <boris.ostrovsky@amd.com>
   3 Date: Wed, 5 Dec 2012 06:12:42 -0500
   4 Subject: x86,AMD: Power driver support for AMD's family 16h processors
   5
   6 From: Boris Ostrovsky <boris.ostrovsky@amd.com>
   7
   8 commit 22e32f4f57778ebc6e17812fa3008361c05d64f9 upstream.
   9
  10 Add family 16h PCI ID to AMD's power driver to allow it report
  11 power consumption on these processors.
  12
  13 Signed-off-by: Boris Ostrovsky <boris.ostrovsky@amd.com>
  14 Signed-off-by: Guenter Roeck <linux@roeck-us.net>
  15 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  16
  17 ---
  18  drivers/hwmon/fam15h_power.c |    4 ++++
  19  1 file changed, 4 insertions(+)
  20
  21 --- a/drivers/hwmon/fam15h_power.c
  22 +++ b/drivers/hwmon/fam15h_power.c
  23 @@ -31,6 +31,9 @@ MODULE_DESCRIPTION("AMD Family 15h CPU p
  24  MODULE_AUTHOR("Andreas Herrmann <andreas.herrmann3@amd.com>");
  25  MODULE_LICENSE("GPL");
  26
  27 +/* Family 16h Northbridge's function 4 PCI ID */
  28 +#define PCI_DEVICE_ID_AMD_16H_NB_F4    0x1534
  29 +
  30  /* D18F3 */
  31  #define REG_NORTHBRIDGE_CAP            0xe8
  32
  33 @@ -256,6 +259,7 @@ static void __devexit fam15h_power_remov
  34
  35  static DEFINE_PCI_DEVICE_TABLE(fam15h_power_id_table) = {
  36         { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
  37 +       { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
  38         {}
  39  };
  40  MODULE_DEVICE_TABLE(pci, fam15h_power_id_table);