Unverified Commit 90619eb1 authored Apr 02, 2018 by Pierre-Louis Bossart Committed by Mark Brown Apr 12, 2018

ASoC: Intel: atom: fix ACPI/PCI Kconfig



The split between ACPI and PCI platforms generated issues with randconfig:

with SND_SST_ATOM_HIFI2_PLATFORM_PCI=y and
SND_SST_ATOM_HIFI2_PLATFORM=m, we get this module link failure:

ERROR: "sst_context_init"
[sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined!

ERROR: "sst_context_cleanup"
[sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined!

ERROR: "sst_alloc_drv_context"
[sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined!

ERROR: "intel_sst_pm" [sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko]
undefined!

ERROR: "sst_configure_runtime_pm"
[sound/soc/intel/atom/sst/snd-intel-sst-acpi.ko] undefined!

To keep things simple, let's expose two configs for
SND_SST_ATOM_HIFI2_PLATFORM_PCI and SND_SST_ATOM_HIFI2_PLATFORM_ACPI,
which select a common SND_SST_ATOM_HIFI2_PLATFORM option. To avoid
breaking existing solutions with the semantics change,
SND_SST_ATOM_HIFI2_PLATFORM_ACPI uses "default ACPI" so that "make
oldnoconfig" and "make olddefconfig" still work as expected.

Also remove mentions of Medfield while we are at it since it was
removed recently.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 4772c16e ("ASoC: Intel: Kconfig: Simplify-clarify ACPI/PCI
dependencies")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-By: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent 6f542703

sound/soc/intel/Kconfig

+13 −9

Original line number	Diff line number	Diff line
		@@ -72,24 +72,28 @@ config SND_SOC_INTEL_BAYTRAIL
		for Baytrail Chromebooks but this option is now deprecated and is
		not recommended, use SND_SST_ATOM_HIFI2_PLATFORM instead.

		config SND_SST_ATOM_HIFI2_PLATFORM
		tristate
		select SND_SOC_COMPRESS

		config SND_SST_ATOM_HIFI2_PLATFORM_PCI
		tristate "PCI HiFi2 (Medfield, Merrifield) Platforms"
		tristate "PCI HiFi2 (Merrifield) Platforms"
		depends on X86 && PCI
		select SND_SST_IPC_PCI
		select SND_SOC_COMPRESS
		select SND_SST_ATOM_HIFI2_PLATFORM
		help
		If you have a Intel Medfield or Merrifield/Edison platform, then
		If you have a Intel Merrifield/Edison platform, then
		enable this option by saying Y or m. Distros will typically not
		enable this option: Medfield devices are not available to
		developers and while Merrifield/Edison can run a mainline kernel with
		limited functionality it will require a firmware file which
		is not in the standard firmware tree
		enable this option: while Merrifield/Edison can run a mainline
		kernel with limited functionality it will require a firmware file
		which is not in the standard firmware tree

		config SND_SST_ATOM_HIFI2_PLATFORM
		config SND_SST_ATOM_HIFI2_PLATFORM_ACPI
		tristate "ACPI HiFi2 (Baytrail, Cherrytrail) Platforms"
		default ACPI
		depends on X86 && ACPI
		select SND_SST_IPC_ACPI
		select SND_SOC_COMPRESS
		select SND_SST_ATOM_HIFI2_PLATFORM
		select SND_SOC_ACPI_INTEL_MATCH
		select IOSF_MBI
		help

Admin message