diff options
| author |   Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> | 2020-11-12 16:38:19 -0600 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2020-11-19 18:24:39 +0000 |
| commit | df5f5edaef4b653fa731dcf3753e71766f95c2cd (patch) | |
| tree | edbb4d57b545f8bfb02c5aed153afabbf3f04115 /sound/soc/intel/atom/sst | |
| parent | ASoC: SOF: acpi: add dynamic selection of DSP driver (diff) | |
| download | linux-dev-df5f5edaef4b653fa731dcf3753e71766f95c2cd.tar.xz linux-dev-df5f5edaef4b653fa731dcf3753e71766f95c2cd.zip | |
ASoC: Intel: Atom: add dynamic selection of DSP driver
Follow PCI example and stop the probe when another driver is desired
for the same ACPI HID.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@linux.intel.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Link: https://lore.kernel.org/r/20201112223825.39765-9-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/atom/sst')
| -rw-r--r-- | sound/soc/intel/atom/sst/sst_acpi.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c index f943a0884976..2c1b8a2e3506 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c @@ -21,6 +21,7 @@ #include <linux/acpi.h> #include <asm/platform_sst_audio.h> #include <sound/core.h> +#include <sound/intel-dsp-config.h> #include <sound/soc.h> #include <sound/compress_driver.h> #include <acpi/acbuffer.h> @@ -246,6 +247,13 @@ static int sst_acpi_probe(struct platform_device *pdev) id = acpi_match_device(dev->driver->acpi_match_table, dev); if (!id) return -ENODEV; + + ret = snd_intel_acpi_dsp_driver_probe(dev, id->id); + if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SST) { + dev_dbg(dev, "SST ACPI driver not selected, aborting probe\n"); + return -ENODEV; + } + dev_dbg(dev, "for %s\n", id->id); mach = (struct snd_soc_acpi_mach *)id->driver_data; |