alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, broonie@kernel.org,
	Randy Dunlap <rdunlap@infradead.org>,
	Arnd Bergmann <arnd@arndb.de>,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [alsa-devel] [PATCH 06/11] ASoC: SOF: Intel: use def_tristate, avoid using select
Date: Fri,  1 Nov 2019 12:30:40 -0500	[thread overview]
Message-ID: <20191101173045.27099-7-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20191101173045.27099-1-pierre-louis.bossart@linux.intel.com>

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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/soc/sof/Kconfig       | 2 --
 sound/soc/sof/intel/Kconfig | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/sound/soc/sof/Kconfig b/sound/soc/sof/Kconfig
index 6435eb531668..71a0fc075a63 100644
--- a/sound/soc/sof/Kconfig
+++ b/sound/soc/sof/Kconfig
@@ -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
diff --git a/sound/soc/sof/intel/Kconfig b/sound/soc/sof/intel/Kconfig
index 0cc82325d9fe..b27fd3fdf335 100644
--- a/sound/soc/sof/intel/Kconfig
+++ b/sound/soc/sof/intel/Kconfig
@@ -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
-- 
2.20.1

_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

  parent reply	other threads:[~2019-11-01 17:45 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-01 17:30 [alsa-devel] [PATCH 00/11] ASoC: SOF/Intel: Kconfig improvements/fixes Pierre-Louis Bossart
2019-11-01 17:30 ` [alsa-devel] [PATCH 01/11] ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Intel: Baytrail: clarify mutual exclusion with Atom/SST driver" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 02/11] ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Intel: Broadwell: clarify mutual exclusion with legacy driver" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver" to the asoc tree Mark Brown
2019-11-04 20:18   ` [alsa-devel] [PATCH 03/11] ASoC: Intel: add mutual exclusion between SOF and legacy Baytrail driver Cezary Rojewski
2019-11-04 21:52     ` Pierre-Louis Bossart
2019-11-08 17:44       ` Cezary Rojewski
2019-11-08 19:24         ` Curtis Malainey
2019-11-01 17:30 ` [alsa-devel] [PATCH 04/11] ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Kconfig: add EXPERT dependency for developer options, clarify help" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 05/11] ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: imx: fix reverse CONFIG_SND_SOC_SOF_OF dependency" to the asoc tree Mark Brown
2019-11-01 17:30 ` Pierre-Louis Bossart [this message]
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: SOF: Intel: use def_tristate, avoid using select" " Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 07/11] ASoC: Intel: Skylake: mark HDAudio codec support as deprecated Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: Skylake: mark HDAudio codec support as deprecated." to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 08/11] ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: remove select SND_HDA_DSP_LOADER" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 09/11] ASoC: Intel: boards: fix configs for bxt-da7219-max98057a Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: fix configs for bxt-da7219-max98057a" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 10/11] ASoC: Intel: boards: Geminilake is only supported by SOF Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: Geminilake is only supported by SOF" to the asoc tree Mark Brown
2019-11-01 17:30 ` [alsa-devel] [PATCH 11/11] ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK Pierre-Louis Bossart
2019-11-04 13:27   ` [alsa-devel] Applied "ASoC: Intel: boards: sof_rt5682: use dependency on SOF_HDA_LINK" to the asoc tree Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191101173045.27099-7-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=arnd@arndb.de \
    --cc=broonie@kernel.org \
    --cc=rdunlap@infradead.org \
    --cc=tiwai@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).