Unverified Commit eda12425 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "Kconfig updates for DMIC and SOF HDMI support" from Ranjani... 

Merge series "Kconfig updates for DMIC and SOF HDMI support" from Ranjani Sridharan <ranjani.sridharan@linux.intel.com>:

This series provides the following updtes to the Intel machine driver
Kconfig:

1. The first patch adds the explicit dependency on GPIOLIB when
SND_SOC_DMIC is selected.

2. SND_SOC_SOF_HDA_AUDIO_CODEC is required for using the legacy
HDA codec driver for HDMI support in SOF. The last 3 three patches
make the required changes to account for this.

Libin Yang (3):
  ASoC: intel: add depends on SND_SOC_SOF_HDA_AUDIO_CODEC for common
    hdmi
  ASoC: sof-sdw: remove CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC condition
  ASoC: sof_pcm512x: remove CONFIG_SND_HDA_CODEC_HDMI condition

Pierre-Louis Bossart (1):
  ASoC: Intel: boards: add explicit dependency on GPIOLIB when DMIC is
    used

 sound/soc/intel/boards/Kconfig        | 51 ++++++++++++++-------------
 sound/soc/intel/boards/sof_pcm512x.c  |  9 -----
 sound/soc/intel/boards/sof_sdw.c      |  8 -----
 sound/soc/intel/boards/sof_sdw_hdmi.c |  7 ----
 4 files changed, 26 insertions(+), 49 deletions(-)

--
2.17.1
parents 433f9cba 4262ddc2

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