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

ASoC: Intel: boards: fix configs for bxt-da7219-max98057a 



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: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191101173045.27099-10-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/Kconfig

+22 −2
Original line number Diff line number Diff line
@@ -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"

sound/soc/intel/boards/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE