ASoC: Intel: Atom: add dynamic selection of DSP driver (df5f5eda) · Commits · 戴 / test

Follow PCI example and stop the probe when another driver is desired for the same ACPI HID. Signed-off-by:

sound/soc/intel/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
		depends on X86 && ACPI && PCI
		select SND_SST_ATOM_HIFI2_PLATFORM
		select SND_SOC_ACPI_INTEL_MATCH
		select SND_INTEL_DSP_CONFIG
		select IOSF_MBI
		help
		If you have a Intel Baytrail or Cherrytrail platform with an I2S

+8 −0

Original line number	Diff line number	Diff line
		@@ -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;