aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/fam15h_power.c
diff options
context:
space:
mode:
authorBoris Ostrovsky <boris.ostrovsky@amd.com>2012-12-05 06:12:42 -0500
committerGuenter Roeck <linux@roeck-us.net>2012-12-05 13:54:41 -0500
commit22e32f4f57778ebc6e17812fa3008361c05d64f9 (patch)
tree3c232f5868936c134df0f575a05f546796f77186 /drivers/hwmon/fam15h_power.c
parent9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff)
x86,AMD: Power driver support for AMD's family 16h processors
Add family 16h PCI ID to AMD's power driver to allow it report power consumption on these processors. Signed-off-by: Boris Ostrovsky <boris.ostrovsky@amd.com> Cc: stable@vger.kernel.org Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/fam15h_power.c')
-rw-r--r--drivers/hwmon/fam15h_power.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 4f4110407387..34ab2a8f9654 100644
--- a/drivers/hwmon/fam15h_power.c
+++ b/drivers/hwmon/fam15h_power.c
@@ -31,6 +31,9 @@ MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor");
31MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>"); 31MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>");
32MODULE_LICENSE("GPL"); 32MODULE_LICENSE("GPL");
33 33
34/* Family 16h Northbridge's function 4 PCI ID */
35#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534
36
34/* D18F3 */ 37/* D18F3 */
35#define REG_NORTHBRIDGE_CAP 0xe8 38#define REG_NORTHBRIDGE_CAP 0xe8
36 39
@@ -248,6 +251,7 @@ static void __devexit fam15h_power_remove(struct pci_dev *pdev)
248 251
249static DEFINE_PCI_DEVICE_TABLE(fam15h_power_id_table) = { 252static DEFINE_PCI_DEVICE_TABLE(fam15h_power_id_table) = {
250 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) }, 253 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
254 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
251 {} 255 {}
252}; 256};
253MODULE_DEVICE_TABLE(pci, fam15h_power_id_table); 257MODULE_DEVICE_TABLE(pci, fam15h_power_id_table);