diff options
| author | Boris Ostrovsky <boris.ostrovsky@amd.com> | 2012-12-05 06:12:42 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-17 10:49:02 -0800 |
| commit | cde5ccfd7fff61f9b652dc7b42a40168e3e45f93 (patch) | |
| tree | 48069416efa3089681a07099e5a4c00523addd32 /drivers/hwmon | |
| parent | b9f21c252726e320c3878d9206571e2178cafd10 (diff) | |
| download | kernel_samsung_smdk4412-cde5ccfd7fff61f9b652dc7b42a40168e3e45f93.zip kernel_samsung_smdk4412-cde5ccfd7fff61f9b652dc7b42a40168e3e45f93.tar.gz kernel_samsung_smdk4412-cde5ccfd7fff61f9b652dc7b42a40168e3e45f93.tar.bz2 | |
x86,AMD: Power driver support for AMD's family 16h processors
commit 22e32f4f57778ebc6e17812fa3008361c05d64f9 upstream.
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>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/fam15h_power.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index ac2d6cb..770e959 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"); MODULE_AUTHOR("Andreas Herrmann <andreas.herrmann3@amd.com>"); MODULE_LICENSE("GPL"); +/* Family 16h Northbridge's function 4 PCI ID */ +#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534 + /* D18F3 */ #define REG_NORTHBRIDGE_CAP 0xe8 @@ -256,6 +259,7 @@ static void __devexit fam15h_power_remove(struct pci_dev *pdev) static DEFINE_PCI_DEVICE_TABLE(fam15h_power_id_table) = { { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) }, + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) }, {} }; MODULE_DEVICE_TABLE(pci, fam15h_power_id_table); |