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>

diff --git a/drivers/thermal/intel/intel_tcc_cooling.c b/drivers/thermal/intel/intel_tcc_cooling.c
index 6c392147e6d1c99f134cddcd501e9d07798c312a..63696e7d7b3c049a55446e2a0facebd44857724e 100644 (file)
--- a/drivers/thermal/intel/intel_tcc_cooling.c
+++ b/drivers/thermal/intel/intel_tcc_cooling.c
@@ -49,21 +49,21 @@ static const struct thermal_cooling_device_ops tcc_cooling_ops = {
 };
 
 static const struct x86_cpu_id tcc_ids[] __initconst = {
-       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(SKYLAKE_L, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(KABYLAKE_L, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_L, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(TIGERLAKE_L, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(COMETLAKE, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(ALDERLAKE_L, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(ATOM_GRACEMONT, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_P, NULL),
-       X86_MATCH_INTEL_FAM6_MODEL(RAPTORLAKE_S, NULL),
+       X86_MATCH_VFM(INTEL_SKYLAKE, NULL),
+       X86_MATCH_VFM(INTEL_SKYLAKE_L, NULL),
+       X86_MATCH_VFM(INTEL_KABYLAKE, NULL),
+       X86_MATCH_VFM(INTEL_KABYLAKE_L, NULL),
+       X86_MATCH_VFM(INTEL_ICELAKE, NULL),
+       X86_MATCH_VFM(INTEL_ICELAKE_L, NULL),
+       X86_MATCH_VFM(INTEL_TIGERLAKE, NULL),
+       X86_MATCH_VFM(INTEL_TIGERLAKE_L, NULL),
+       X86_MATCH_VFM(INTEL_COMETLAKE, NULL),
+       X86_MATCH_VFM(INTEL_ALDERLAKE, NULL),
+       X86_MATCH_VFM(INTEL_ALDERLAKE_L, NULL),
+       X86_MATCH_VFM(INTEL_ATOM_GRACEMONT, NULL),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE, NULL),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE_P, NULL),
+       X86_MATCH_VFM(INTEL_RAPTORLAKE_S, NULL),
        {}
 };