diff options
| author | Huang Rui <ray.huang@amd.com> | 2015-10-30 17:56:56 +0800 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2015-10-31 15:40:12 -0700 |
| commit | 46f29c2b494600cd326b84f87f5765e80fffface (patch) | |
| tree | 74ce909eb285e71da1d5bbfae10ce4b3d5dcc466 | |
| parent | 7deb14b1316def5d4c85f99718d9e530d53cef4e (diff) | |
| download | op-kernel-dev-46f29c2b494600cd326b84f87f5765e80fffface.zip op-kernel-dev-46f29c2b494600cd326b84f87f5765e80fffface.tar.gz | |
hwmon: (fam15h_power) Enable power1_input on AMD Carrizo
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>
| -rw-r--r-- | drivers/hwmon/fam15h_power.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 2d899fd..a46e166 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -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; |
