Unverified Commit b000135e authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: SOF: Intel: use def_tristate, avoid using select 



So far we used select to use the relevant built-in/module options, but
this led to blurring layers between core and Intel Kconfigs.

Use def_tristate works just as well and removes Intel stuff from the code.

Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-7-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f9ad7546

sound/soc/sof/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ config SND_SOC_SOF_PCI 
	depends on PCI

	select SND_SOC_SOF

	select SND_SOC_ACPI if ACPI

	select SND_SOC_SOF_INTEL_PCI if SND_SOC_SOF_INTEL_TOPLEVEL

	help

	  This adds support for PCI enumeration. This option is

	  required to enable Intel Skylake+ devices
@@ -26,7 +25,6 @@ config SND_SOC_SOF_ACPI 
	depends on ACPI || COMPILE_TEST

	select SND_SOC_SOF

	select SND_SOC_ACPI if ACPI

	select SND_SOC_SOF_INTEL_ACPI if SND_SOC_SOF_INTEL_TOPLEVEL

	select IOSF_MBI if X86 && PCI

	help

	  This adds support for ACPI enumeration. This option is required

sound/soc/sof/intel/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ config SND_SOC_SOF_INTEL_TOPLEVEL 
if SND_SOC_SOF_INTEL_TOPLEVEL



config SND_SOC_SOF_INTEL_ACPI

	tristate

	def_tristate SND_SOC_SOF_ACPI

	select SND_SOC_SOF_BAYTRAIL  if SND_SOC_SOF_BAYTRAIL_SUPPORT

	select SND_SOC_SOF_BROADWELL if SND_SOC_SOF_BROADWELL_SUPPORT

	help
@@ -18,7 +18,7 @@ config SND_SOC_SOF_INTEL_ACPI 
	  'select' statements at a higher level



config SND_SOC_SOF_INTEL_PCI

	tristate

	def_tristate SND_SOC_SOF_PCI

	select SND_SOC_SOF_MERRIFIELD  if SND_SOC_SOF_MERRIFIELD_SUPPORT

	select SND_SOC_SOF_APOLLOLAKE  if SND_SOC_SOF_APOLLOLAKE_SUPPORT

	select SND_SOC_SOF_GEMINILAKE  if SND_SOC_SOF_GEMINILAKE_SUPPORT

CRA Git | Maintained and supported by SUSTech CRA and CCSE