[PATCH v4 68/71] ASoC: Intel: avs: es8336: 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 --- sound/soc/intel/avs/boards/es8336.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c index 5c90a6007577..3d5d4685a668 100644 --- a/sound/soc/intel/avs/boards/es8336.c +++ b/sound/soc/intel/avs/boards/es8336.c @@ -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:
New CPU #defines encode vendor and family as well as model.
This appears to be part of a series but I've no cover letter or anything else from it. What's the story for dependencies and merging?
Sorry. I should have at least added a link to the individual patches to provide some pointers. It's my first time with a patch bomb of this size, so I'm learning as I go.
You can pick up the cover letter, and the whole series, from lore with:
$ b4 am 20240424181245.41141-1-tony.luck@intel.com
or pull from: git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git new_families_v4
The dependencies for this patch are already in tip x86/cpu, and in linux-next. Basically these three patches:
f055b6260eb3 x86/cpu/vfm: Update arch/x86/include/asm/intel-family.h e6dfdc2e89a0 x86/cpu/vfm: Add new macros to work with (vendor/family/model) values a9d0adce6907 x86/cpu/vfm: Add/initialize x86_vfm field to struct cpuinfo_x86
For merging. This can either go through tip with the rest of the series. Or you can take it through your own tree after the dependencies get merged into v6.10-rc1 (I'm expecting this to take a couple of release cycles to complete).
-Tony
On Wed, Apr 24, 2024 at 11:15:50AM -0700, Tony Luck wrote:
New CPU #defines encode vendor and family as well as model.
Acked-by: Mark Brown broonie@kernel.org
On 4/24/2024 8:15 PM, Tony Luck wrote:
New CPU #defines encode vendor and family as well as model.
Signed-off-by: Tony Luck tony.luck@intel.com
Thanks!
Reviewed-by: Amadeusz Sławiński amadeuszx.slawinski@linux.intel.com
participants (4)
-
Amadeusz Sławiński -
Luck, Tony -
Mark Brown -
Tony Luck