Unverified Commit 5413dfd8 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: partial fix to Kconfig issues" from Pierre-Louis... 

Merge series "ASoC: SOF: partial fix to Kconfig issues" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

We've had several reports of broken dependencies. The 'right' fix is
to revisit the module dependencies as suggested by Arnd Bergmann. This
is WIP at https://github.com/thesofproject/linux/pull/2683. Since this
is taking longer than expected, I am only sharing quick fixes for now.

Pierre-Louis Bossart (2):
  ASoC: SOF: Intel: soundwire: fix select/depend unmet dependencies
  ASoC: SOF: SND_INTEL_DSP_CONFIG dependency

 sound/soc/sof/intel/Kconfig  |  3 ++-
 sound/soc/sof/sof-acpi-dev.c | 11 ++++++-----
 sound/soc/sof/sof-pci-dev.c  | 10 ++++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

--
2.25.1
parents 9ad9bc59 8a3fea95

sound/soc/sof/intel/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ config SND_SOC_SOF_HDA 


config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK

	bool "SOF support for SoundWire"

	depends on SOUNDWIRE && ACPI

	depends on ACPI

	help

	  This adds support for SoundWire with Sound Open Firmware

	  for Intel(R) platforms.
@@ -371,6 +371,7 @@ config SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE 


config SND_SOC_SOF_INTEL_SOUNDWIRE

	tristate

	select SOUNDWIRE

	select SOUNDWIRE_INTEL

	help

	  This option is not user-selectable but automagically handled by

sound/soc/sof/sof-acpi-dev.c

+6 −5
Original line number Diff line number Diff line
@@ -131,12 +131,13 @@ static int sof_acpi_probe(struct platform_device *pdev) 
	if (!id)

		return -ENODEV;



	if (IS_REACHABLE(CONFIG_SND_INTEL_DSP_CONFIG)) {

		ret = snd_intel_acpi_dsp_driver_probe(dev, id->id);

		if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) {

			dev_dbg(dev, "SOF ACPI driver not selected, aborting probe\n");

			return -ENODEV;

		}



	}

	dev_dbg(dev, "ACPI DSP detected");



	sof_pdata = devm_kzalloc(dev, sizeof(*sof_pdata), GFP_KERNEL);

sound/soc/sof/sof-pci-dev.c

+6 −4
Original line number Diff line number Diff line
@@ -344,11 +344,13 @@ static int sof_pci_probe(struct pci_dev *pci, 
	const struct snd_sof_dsp_ops *ops;

	int ret;



	if (IS_REACHABLE(CONFIG_SND_INTEL_DSP_CONFIG)) {

		ret = snd_intel_dsp_driver_probe(pci);

		if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SOF) {

			dev_dbg(&pci->dev, "SOF PCI driver not selected, aborting probe\n");

			return -ENODEV;

		}

	}

	dev_dbg(&pci->dev, "PCI DSP detected");



	/* get ops for platform */