Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 17:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

hwmon: (fam15h_power) Enable power1_input on AMD Carrizo

Browse Source 
This patch enables power1_input attribute for Carrizo platform.

Signed-off-by: Huang Rui <ray.huang@amd.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Huang Rui 2015-10-30 17:56:56 +08:00 committed by Guenter Roeck
parent 7deb14b131
commit 46f29c2b49
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/hwmon/fam15h_power.c
View File

@ -115,8 +115,11 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev,
{
int n = FAM15H_MIN_NUM_ATTRS;
struct attribute **fam15h_power_attrs;
struct cpuinfo_x86 *c = &boot_cpu_data;
if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf)
if (c->x86 == 0x15 &&
(c->x86_model <= 0xf ||
(c->x86_model >= 0x60 && c->x86_model <= 0x6f)))
n += 1;
fam15h_power_attrs = devm_kcalloc(&pdev->dev, n,
@ -128,7 +131,9 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev,
n = 0;
fam15h_power_attrs[n++] = &dev_attr_power1_crit.attr;
if (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model <= 0xf)
if (c->x86 == 0x15 &&
(c->x86_model <= 0xf ||
(c->x86_model >= 0x60 && c->x86_model <= 0x6f)))
fam15h_power_attrs[n++] = &dev_attr_power1_input.attr;
data->group.attrs = fam15h_power_attrs;