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 09/11] ASoC: Intel: boards: fix configs for bxt-da7219-max98057a
Date: Fri, 1 Nov 2019 12:30:43 -0500 [thread overview]
Message-ID: <20191101173045.27099-10-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20191101173045.27099-1-pierre-louis.bossart@linux.intel.com>
The same driver is reused for 3 different configurations, but the
driver will only be build if ApolloLake is selected.
Fix and make sure each device can work without dependencies on others
(useful for minimal configurations).
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
sound/soc/intel/boards/Kconfig | 24 ++++++++++++++++++++++--
sound/soc/intel/boards/Makefile | 2 +-
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index 91952ffc0b67..826694ecfdbf 100644
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -263,13 +263,17 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI
+config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+ tristate
+ select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
+
if SND_SOC_INTEL_APL
config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
tristate "Broxton with DA7219 and MAX98357A in I2S Mode"
depends on I2C && ACPI
depends on MFD_INTEL_LPSS || COMPILE_TEST
- select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
+ select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
help
This adds support for ASoC machine driver for Broxton-P platforms
with DA7219 + MAX98357A I2S audio codec.
@@ -365,6 +369,17 @@ endif ## SND_SOC_INTEL_KBL
if SND_SOC_INTEL_GLK || (SND_SOC_SOF_GEMINILAKE && SND_SOC_SOF_HDA_LINK)
+config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
+ tristate "GLK with DA7219 and MAX98357A in I2S Mode"
+ depends on I2C && ACPI
+ depends on MFD_INTEL_LPSS || COMPILE_TEST
+ select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+ help
+ This adds support for ASoC machine driver for Geminilake platforms
+ with DA7219 + MAX98357A I2S audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
+ If unsure select "N".
+
config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
tristate "GLK with RT5682 and MAX98357A in I2S Mode"
depends on I2C && ACPI
@@ -418,7 +433,12 @@ config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
depends on I2C && ACPI
depends on MFD_INTEL_LPSS || COMPILE_TEST
- select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
+ select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
+ help
+ This adds support for ASoC machine driver for Cometlake platforms
+ with DA7219 + MAX98357A I2S audio codec.
+ Say Y or m if you have such a device. This is a recommended option.
+ If unsure select "N".
config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH
tristate "CML with RT1011 and RT5682 in I2S Mode"
diff --git a/sound/soc/intel/boards/Makefile b/sound/soc/intel/boards/Makefile
index 9ae6544c6f3b..ba1aa89db09d 100644
--- a/sound/soc/intel/boards/Makefile
+++ b/sound/soc/intel/boards/Makefile
@@ -33,7 +33,7 @@ obj-$(CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH) += snd-soc-sof_rt5682.o
obj-$(CONFIG_SND_SOC_INTEL_HASWELL_MACH) += snd-soc-sst-haswell.o
obj-$(CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH) += snd-soc-sst-byt-rt5640-mach.o
obj-$(CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH) += snd-soc-sst-byt-max98090-mach.o
-obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH) += snd-soc-sst-bxt-da7219_max98357a.o
+obj-$(CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON) += snd-soc-sst-bxt-da7219_max98357a.o
obj-$(CONFIG_SND_SOC_INTEL_BXT_RT298_MACH) += snd-soc-sst-bxt-rt298.o
obj-$(CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH) += snd-soc-sst-glk-rt5682_max98357a.o
obj-$(CONFIG_SND_SOC_INTEL_BROADWELL_MACH) += snd-soc-sst-broadwell.o
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev 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 ` [alsa-devel] [PATCH 06/11] ASoC: SOF: Intel: use def_tristate, avoid using select Pierre-Louis Bossart
2019-11-04 13:27 ` [alsa-devel] Applied "ASoC: SOF: Intel: use def_tristate, avoid using select" to the asoc tree 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 ` Pierre-Louis Bossart [this message]
2019-11-04 13:27 ` [alsa-devel] Applied "ASoC: Intel: boards: fix configs for bxt-da7219-max98057a" " 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-10-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).