[PATCH v3 71/74] x86/cpu/vfm: Update sound/soc/intel/avs/boards/es8336.c
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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c index 5c90a6007577..6c86c581877e 100644 --- a/sound/soc/intel/avs/boards/es8336.c +++ b/sound/soc/intel/avs/boards/es8336.c @@ -18,6 +18,7 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/soc-acpi.h> +#include <asm/cpu_device_id.h> #include <asm/intel-family.h> #include "../utils.h"
@@ -153,9 +154,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:
On 4/16/2024 11:22 PM, Tony Luck wrote:
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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c index 5c90a6007577..6c86c581877e 100644 --- a/sound/soc/intel/avs/boards/es8336.c +++ b/sound/soc/intel/avs/boards/es8336.c @@ -18,6 +18,7 @@ #include <sound/pcm_params.h> #include <sound/soc.h> #include <sound/soc-acpi.h> +#include <asm/cpu_device_id.h> #include <asm/intel-family.h> #include "../utils.h"
@@ -153,9 +154,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:
Any chance we could adjust topic to follow subsystem rules? Something like: ASoC: Intel: avs: boards: Update defines used in es8336 or something like that?
participants (2)
-
Amadeusz Sławiński
-
Tony Luck