Unverified Commit 8f529f01 authored by Libin Yang's avatar Libin Yang Committed by Mark Brown
Browse files

ASoC: intel: add depends on SND_SOC_SOF_HDA_AUDIO_CODEC for common hdmi 



If the driver uses common hdmi, SND_SOC_SOF_HDA_AUDIO_CODEC is required
to be enabled. Otherwise, the legacy hda codec driver will not be used.

Signed-off-by: default avatarLibin Yang <libin.yang@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200529193547.6077-2-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/Kconfig

+10 −10
Original line number Diff line number Diff line
@@ -411,13 +411,13 @@ config SND_SOC_INTEL_KBL_RT5660_MACH 


endif ## SND_SOC_INTEL_KBL



if SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK

if SND_SOC_SOF_GEMINILAKE



config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH

	tristate "GLK with DA7219 and MAX98357A in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON

	help

	   This adds support for ASoC machine driver for Geminilake platforms
@@ -429,7 +429,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH 
	tristate "GLK with RT5682 and MAX98357A in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_RT5682_I2C

	select SND_SOC_MAX98357A

	select SND_SOC_DMIC
@@ -440,7 +440,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH 
	   Say Y if you have such a device.

	   If unsure select "N".



endif ## SND_SOC_SOF_GEMINILAKE  && SND_SOC_SOF_HDA_LINK

endif ## SND_SOC_SOF_GEMINILAKE



if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC
@@ -463,9 +463,9 @@ if SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL 
config SND_SOC_INTEL_SOF_RT5682_MACH

	tristate "SOF with rt5682 codec in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on (SND_SOC_SOF_HDA_LINK && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\

	depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\

		    (MFD_INTEL_LPSS || COMPILE_TEST)) ||\

		   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_MAX98373

	select SND_SOC_RT1015

	select SND_SOC_RT5682_I2C
@@ -509,7 +509,7 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH 
	tristate "CML with RT1011 and RT5682 in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_RT1011

	select SND_SOC_RT5682_I2C

	select SND_SOC_DMIC
@@ -528,7 +528,7 @@ config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH 
	tristate "SOF with DA7219 and MAX98373/MAX98360A in I2S Mode"

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_DA7219

	select SND_SOC_MAX98373

	select SND_SOC_DMIC
@@ -546,7 +546,7 @@ config SND_SOC_INTEL_EHL_RT5660_MACH 
	tristate "EHL with RT5660 in I2S mode"

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_RT5660

	select SND_SOC_DMIC

	help
@@ -563,7 +563,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH 
	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST

	depends on SOUNDWIRE

	depends on SND_HDA_CODEC_HDMI

	depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC

	select SND_SOC_RT700_SDW

	select SND_SOC_RT711_SDW

	select SND_SOC_RT1308_SDW