AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-18 16:46:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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 default 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>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20191126145304.24204-3-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kai Vehmanen 2019-11-26 08:53:03 -06:00 committed by Mark Brown
parent 179d5811c2
commit e3d8f8ae5b
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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_DA7219
select SND_SOC_MAX98357A select SND_SOC_MAX98357A
select SND_SOC_DMIC select SND_SOC_DMIC
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
select SND_SOC_HDAC_HDMI select SND_SOC_HDAC_HDMI
config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON config SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
@ -387,6 +388,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
select SND_SOC_RT5682 select SND_SOC_RT5682
select SND_SOC_MAX98357A select SND_SOC_MAX98357A
select SND_SOC_DMIC select SND_SOC_DMIC
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
select SND_SOC_HDAC_HDMI select SND_SOC_HDAC_HDMI
help help
This adds support for ASoC machine driver for Geminilake platforms This adds support for ASoC machine driver for Geminilake platforms
@ -400,6 +402,7 @@ if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC
config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
tristate "SKL/KBL/BXT/APL with HDA Codecs" 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_HDAC_HDMI
select SND_SOC_DMIC select SND_SOC_DMIC
# SND_SOC_HDAC_HDA is already selected # SND_SOC_HDAC_HDA is already selected
@ -419,6 +422,7 @@ config SND_SOC_INTEL_SOF_RT5682_MACH
(SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST)) (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))
select SND_SOC_RT5682 select SND_SOC_RT5682
select SND_SOC_DMIC select SND_SOC_DMIC
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
select SND_SOC_HDAC_HDMI select SND_SOC_HDAC_HDMI
help help
This adds support for ASoC machine driver for SOF platforms This adds support for ASoC machine driver for SOF platforms
@ -448,6 +452,7 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH
select SND_SOC_RT5682 select SND_SOC_RT5682
select SND_SOC_DMIC select SND_SOC_DMIC
select SND_SOC_HDAC_HDMI select SND_SOC_HDAC_HDMI
select SND_HDA_CODEC_HDMI if SND_SOC_SOF_HDA_CODEC
help help
This adds support for ASoC machine driver for SOF platform with This adds support for ASoC machine driver for SOF platform with
RT1011 + RT5682 I2S codec. RT1011 + RT5682 I2S codec.