github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-03 20:14:06 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ASoC: Intel: boards: make common HDMI driver the default for SOF

Browse Source 
Modify Kconfig rules for machine drivers used by SOF to pick
SND_HDA_CODEC_HDMI by defeault if other conditions are met. For
shared machine drivers used also by older SST driver, keep using
HDAC_HDMI.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
This commit is contained in:
Kai Vehmanen 2019-11-22 18:19:48 +02:00 committed by Pierre Bossart
parent aa49974f32
commit 8591404e1d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/soc/intel/boards/Kconfig
View File

@ -261,6 +261,7 @@ config SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
select SND_SOC_DA7219
select SND_SOC_MAX98357A
select SND_SOC_DMIC
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
select SND_SOC_HDAC_HDMI
config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
@ -301,6 +302,7 @@ config SND_SOC_INTEL_BXT_PCM512x_MACH
tristate "Broxton with TI PCM512x codec"
depends on MFD_INTEL_LPSS && I2C && ACPI
select SND_SOC_PCM512x_I2C
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
select SND_SOC_HDAC_HDMI if SND_SOC_SOF_HDA_LINK
help
This adds support for ASoC machine driver for Broxton platforms
@ -412,6 +414,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
select SND_SOC_RT5682
select SND_SOC_MAX98357A
select SND_SOC_DMIC
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
select SND_SOC_HDAC_HDMI
help
This adds support for ASoC machine driver for Geminilake platforms
@ -425,6 +428,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"
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
select SND_SOC_HDAC_HDMI
select SND_SOC_DMIC
# SND_SOC_HDAC_HDA is already selected
@ -444,6 +448,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH
(SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))
select SND_SOC_RT5682
select SND_SOC_DMIC
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
select SND_SOC_HDAC_HDMI
help
This adds support for ASoC machine driver for SOF platforms
@ -473,6 +478,7 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH
select SND_SOC_RT5682
select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
help
This adds support for ASoC machine driver for SOF platform with
RT1011 + RT5682 I2S codec.
@ -489,6 +495,7 @@ config SND_SOC_INTEL_TGL_RT1308_MACH
depends on MFD_INTEL_LPSS || COMPILE_TEST
select SND_SOC_RT1308
select SND_SOC_DMIC
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
select SND_SOC_HDAC_HDMI if SND_SOC_SOF_HDA_LINK
help
This adds support for ASoC machine driver for Tigerlake platforms