Skip to contentSkip to conversation

ASoC: Intel: avs: es8336: Switch to new Intel CPU model defines

PATCH Superseded Tony Luck 1 participant 1 message May 29, 2024

Subsystems (3)

v6 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Tony Luck

author
#0 lore raw

PATCH v6 6/49 ASoC: Intel: avs: es8336: Switch to new Intel CPU model defines

New CPU #defines encode vendor and family as well as model.

---
 sound/soc/intel/avs/boards/es8336.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/intel/avs/boards/es8336.c +4 -4
index 3bf37a8fd6e6..c8522e2430f8 100644
@@ -18,7 +18,7 @@
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-acpi.h>
-#include <asm/intel-family.h>
+#include <asm/cpu_device_id.h>
 #include "../utils.h"
 
 #define ES8336_CODEC_DAI	"ES8316 HiFi"
@@ -153,9 +153,9 @@ static int avs_es8336_hw_params(struct snd_pcm_substream *substream,
 	int clk_freq;
 	int ret;
 
-	switch (boot_cpu_data.x86_model) {
-	case INTEL_FAM6_KABYLAKE_L:
-	case INTEL_FAM6_KABYLAKE:
+	switch (boot_cpu_data.x86_vfm) {
+	case INTEL_KABYLAKE_L:
+	case INTEL_KABYLAKE:
 		clk_freq = 24000000;
 		break;
 	default:
Signature · 1 line
2.45.0