Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
thermal: intel: intel_tcc_cooling: Switch to new Intel CPU model defines
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
authored by
Tony Luck
and committed by
Rafael J. Wysocki
0f46ecc4
ae2170d6
+15
-15
+15
-15
drivers/thermal/intel/intel_tcc_cooling.c
+15
-15
drivers/thermal/intel/intel_tcc_cooling.c
···
49
49
};
50
50
51
51
static const struct x86_cpu_id tcc_ids[] __initconst = {
52
-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, NULL),
53
-
X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, NULL),
54
-
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, NULL),
55
-
X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, NULL),
56
-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, NULL),
57
-
X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, NULL),
58
-
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, NULL),
59
-
X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL),
60
-
X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, NULL),
61
-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL),
62
-
X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, NULL),
63
-
X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, NULL),
64
-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, NULL),
65
-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, NULL),
66
-
X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, NULL),
52
+
X86_MATCH_VFM(INTEL_SKYLAKE, NULL),
53
+
X86_MATCH_VFM(INTEL_SKYLAKE_L, NULL),
54
+
X86_MATCH_VFM(INTEL_KABYLAKE, NULL),
55
+
X86_MATCH_VFM(INTEL_KABYLAKE_L, NULL),
56
+
X86_MATCH_VFM(INTEL_ICELAKE, NULL),
57
+
X86_MATCH_VFM(INTEL_ICELAKE_L, NULL),
58
+
X86_MATCH_VFM(INTEL_TIGERLAKE, NULL),
59
+
X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL),
60
+
X86_MATCH_VFM(INTEL_COMETLAKE, NULL),
61
+
X86_MATCH_VFM(INTEL_ALDERLAKE, NULL),
62
+
X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL),
63
+
X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, NULL),
64
+
X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL),
65
+
X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL),
66
+
X86_MATCH_VFM(INTEL_RAPTORLAKE_S, NULL),
67
67
{}
68
68
};
69
69