diff options
author | Cezary Rojewski <cezary.rojewski@intel.com> | 2024-08-14 10:39:29 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2024-08-19 14:10:56 +0200 |
commit | 526139aff1d14c5a2cc0a769c063f439444c61c2 (patch) | |
tree | 390f36c945f453aaa987b79fdcdc597c9f8e9c00 /sound/soc/intel | |
parent | ASoC: Intel: Remove skylake driver (diff) | |
download | linux-526139aff1d14c5a2cc0a769c063f439444c61c2.tar.xz linux-526139aff1d14c5a2cc0a769c063f439444c61c2.zip |
ASoC: Intel: avs: Enable by default for all SST configurations
The skylake-driver is deprecated in favour of the avs-driver. As the
latter supports all configurations of its predecessor and more, update
the existing selection mechanism to acknowledge the SST flag.
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://patch.msgid.link/20240814083929.1217319-15-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel')
-rw-r--r-- | sound/soc/intel/avs/core.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c index f2dc82a2abc7..da7bac09acb4 100644 --- a/sound/soc/intel/avs/core.c +++ b/sound/soc/intel/avs/core.c @@ -422,8 +422,14 @@ static int avs_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) int ret; ret = snd_intel_dsp_driver_probe(pci); - if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_AVS) + switch (ret) { + case SND_INTEL_DSP_DRIVER_ANY: + case SND_INTEL_DSP_DRIVER_SST: + case SND_INTEL_DSP_DRIVER_AVS: + break; + default: return -ENODEV; + } ret = pcim_enable_device(pci); if (ret < 0) |