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>

diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
index 2d899fd75f2a0fcc83da120598c6e8f7c30d2e41..a46e166cdd7e95a3f6b627f4751224115d8b7ce0 100644 (file)
--- 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;