diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-07-15 16:31:00 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-07-15 16:31:00 +0200 |
| commit | 97b10a77b150df664bb521ae217dd6bceb40d5d3 (patch) | |
| tree | 9f14e5d6e0a9e048cfef95f41678569dd994aba6 /sound/soc/intel/avs/boards/es8336.c | |
| parent | e54dc34318f62bdeea7edefed386d47fae155618 (diff) | |
| parent | c51cba4755609ad97ba97713210c16f043c73224 (diff) | |
Merge tag 'asoc-v6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for for v6.11
There are a lot of changes in here, though the big bulk of things is
cleanups and simplifications of various kinds which are internally
rather than externally visible. A good chunk of those are DT schema
conversions, but there's also a lot of changes in the code.
Highlights:
- Syncing of features between simple-audio-card and the two
audio-graph cards so there is no reason to stick with an older
driver.
- Support for specifying the order of operations for components within
cards to allow quirking for unusual systems.
- New support for Asahi Kasei AK4619, Cirrus Logic CS530x, Everest
Semiconductors ES8311, NXP i.MX95 and LPC32xx, Qualcomm LPASS v2.5
and WCD937x, Realtek RT1318 and RT1320 and Texas Instruments PCM5242.
Diffstat (limited to 'sound/soc/intel/avs/boards/es8336.c')
| -rw-r--r-- | sound/soc/intel/avs/boards/es8336.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/intel/avs/boards/es8336.c b/sound/soc/intel/avs/boards/es8336.c index 3bf37a8fd6e6..c8522e2430f8 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: |