diff options
| author | Rafael J. Wysocki <[email protected]> | 2024-06-21 14:47:17 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2024-06-21 14:47:17 +0200 |
| commit | 73abe7002eea73fa4c006249e1adb9dee3a8c79f (patch) | |
| tree | 1e50034b9a004d57ead871b602538d0d156c1644 /include | |
| parent | 096597cfe4ea08b1830e775436d76d7c9d6d3037 (diff) | |
| parent | 68de0ae4d6b5ea675b835e4a6b00f52a26cd7f0c (diff) | |
Merge back thermal control changes related to Intel platforms for v6.11
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/platform_data/x86/soc.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/platform_data/x86/soc.h b/include/linux/platform_data/x86/soc.h index a5705189e2ac..f981907a5cb0 100644 --- a/include/linux/platform_data/x86/soc.h +++ b/include/linux/platform_data/x86/soc.h @@ -20,7 +20,7 @@ static inline bool soc_intel_is_##soc(void) \ { \ static const struct x86_cpu_id soc##_cpu_ids[] = { \ - X86_MATCH_INTEL_FAM6_MODEL(type, NULL), \ + X86_MATCH_VFM(type, NULL), \ {} \ }; \ const struct x86_cpu_id *id; \ @@ -31,11 +31,11 @@ static inline bool soc_intel_is_##soc(void) \ return false; \ } -SOC_INTEL_IS_CPU(byt, ATOM_SILVERMONT); -SOC_INTEL_IS_CPU(cht, ATOM_AIRMONT); -SOC_INTEL_IS_CPU(apl, ATOM_GOLDMONT); -SOC_INTEL_IS_CPU(glk, ATOM_GOLDMONT_PLUS); -SOC_INTEL_IS_CPU(cml, KABYLAKE_L); +SOC_INTEL_IS_CPU(byt, INTEL_ATOM_SILVERMONT); +SOC_INTEL_IS_CPU(cht, INTEL_ATOM_AIRMONT); +SOC_INTEL_IS_CPU(apl, INTEL_ATOM_GOLDMONT); +SOC_INTEL_IS_CPU(glk, INTEL_ATOM_GOLDMONT_PLUS); +SOC_INTEL_IS_CPU(cml, INTEL_KABYLAKE_L); #undef SOC_INTEL_IS_CPU |