Messages in this thread Patch in this message | | | From | Huang Rui <> | Subject | [PATCH 05/15] hwmon, fam15h_power: enable power1_input on AMD Carrizo | Date | Thu, 27 Aug 2015 16:07:36 +0800 |
| |
This patch enables power1_input attribute for Carrizo platform.
Signed-off-by: Huang Rui <ray.huang@amd.com> --- drivers/hwmon/fam15h_power.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c index 3e9b3b9..55b25ef 100644 --- a/drivers/hwmon/fam15h_power.c +++ b/drivers/hwmon/fam15h_power.c @@ -113,8 +113,11 @@ static int fam15h_power_init_attrs(struct pci_dev *pdev) { int n = FAM15H_MIN_POWER_GROUPS; 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; fam15h_power_group.attrs = fam15h_power_attrs; -- 1.9.1
| |