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

ASoC: Intel: boards: add explicit dependency on GPIOLIB when DMIC is used 



SND_SOC_DMIC depends on GPIOLIB, so let's add the dependency before
selecting SND_SOC_DMIC.

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarGuennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Link: https://lore.kernel.org/r/20200427165211.23463-2-ranjani.sridharan@linux.intel.com


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

sound/soc/intel/boards/Kconfig

+16 −15
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ if SND_SOC_INTEL_SKL 


config SND_SOC_INTEL_SKL_RT286_MACH

	tristate "SKL with RT286 I2S mode"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_RT286

	select SND_SOC_DMIC
@@ -256,7 +256,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH 


config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH

	tristate "SKL with NAU88L25 and SSM4567 in I2S Mode"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_NAU8825

	select SND_SOC_SSM4567
@@ -270,7 +270,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH 


config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH

	tristate "SKL with NAU88L25 and MAX98357A in I2S Mode"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_NAU8825

	select SND_SOC_MAX98357A
@@ -299,7 +299,7 @@ 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 I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
@@ -311,7 +311,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH 


config SND_SOC_INTEL_BXT_RT298_MACH

	tristate "Broxton with RT298 I2S mode"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_RT298

	select SND_SOC_DMIC
@@ -328,7 +328,7 @@ if SND_SOC_INTEL_KBL 


config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH

	tristate "KBL with RT5663 and MAX98927 in I2S Mode"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_RT5663

	select SND_SOC_MAX98927
@@ -370,7 +370,7 @@ config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH 


config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH

	tristate "KBL with DA7219 and MAX98927 in I2S Mode"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_DA7219

	select SND_SOC_MAX98927
@@ -400,7 +400,7 @@ if 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 I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
@@ -412,7 +412,7 @@ config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH 


config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH

	tristate "GLK with RT5682 and MAX98357A in I2S Mode"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_RT5682
@@ -432,6 +432,7 @@ if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC 
config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH

	tristate "SKL/KBL/BXT/APL with HDA Codecs"

	depends on SND_HDA_CODEC_HDMI

	depends on GPIOLIB

	select SND_SOC_HDAC_HDMI

	select SND_SOC_DMIC

	# SND_SOC_HDAC_HDA is already selected
@@ -446,7 +447,7 @@ endif ## SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC 
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

	depends on I2C && ACPI && GPIOLIB

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

		   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))

	depends on SND_HDA_CODEC_HDMI
@@ -480,7 +481,7 @@ if (SND_SOC_SOF_COMETLAKE_LP && SND_SOC_SOF_HDA_LINK) 


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 I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON

	help
@@ -491,7 +492,7 @@ config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH 


config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH

	tristate "CML with RT1011 and RT5682 in I2S Mode"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_RT1011
@@ -510,7 +511,7 @@ if SND_SOC_SOF_JASPERLAKE 


config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH

	tristate "SOF with DA7219 and MAX98373/MAX98360A in I2S Mode"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_DA7219
@@ -528,7 +529,7 @@ if SND_SOC_SOF_ELKHARTLAKE 


config SND_SOC_INTEL_EHL_RT5660_MACH

	tristate "EHL with RT5660 in I2S mode"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_HDA_CODEC_HDMI

	select SND_SOC_RT5660
@@ -543,7 +544,7 @@ if SND_SOC_SOF_INTEL_SOUNDWIRE 


config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH

	tristate "SoundWire generic machine driver"

	depends on I2C && ACPI

	depends on I2C && ACPI && GPIOLIB

	depends on MFD_INTEL_LPSS || COMPILE_TEST

	depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST

	depends on SOUNDWIRE

CRA Git | Maintained and supported by SUSTech CRA and CCSE