Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
thermal: intel: intel_soc_dts_thermal: 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
a31a0a3e
0f46ecc4
+7
-7
+1
-1
drivers/thermal/intel/intel_soc_dts_thermal.c
+1
-1
drivers/thermal/intel/intel_soc_dts_thermal.c
+6
-6
include/linux/platform_data/x86/soc.h
+6
-6
include/linux/platform_data/x86/soc.h
···
20
20
static inline bool soc_intel_is_##soc(void) \
21
21
{ \
22
22
static const struct x86_cpu_id soc##_cpu_ids[] = { \
23
-
X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \
23
+
X86_MATCH_VFM(type, NULL), \
24
24
{} \
25
25
}; \
26
26
const struct x86_cpu_id *id; \
···
31
31
return false; \
32
32
}
33
33
34
-
SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT);
35
-
SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT);
36
-
SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT);
37
-
SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS);
38
-
SOC_INTEL_IS_CPU(cml, KABYLAKE_L);
34
+
SOC_INTEL_IS_CPU(byt, INTEL_ATOM_SILVERMONT);
35
+
SOC_INTEL_IS_CPU(cht, INTEL_ATOM_AIRMONT);
36
+
SOC_INTEL_IS_CPU(apl, INTEL_ATOM_GOLDMONT);
37
+
SOC_INTEL_IS_CPU(glk, INTEL_ATOM_GOLDMONT_PLUS);
38
+
SOC_INTEL_IS_CPU(cml, INTEL_KABYLAKE_L);
39
39
40
40
#undef SOC_INTEL_IS_CPU
41
41