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

ASoC: Intel: tgl_rt1308: fix build issue with HDAC_HDMI not set

Browse Source 
Fix the ifdefs so that build does not fail if SND_SOC_HDAC_HDMI
is not.

Note: Only the common HDMI codec driver has support for TGL.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
This commit is contained in:
Kai Vehmanen 2019-11-15 11:21:47 +02:00 committed by Pierre Bossart
parent bc30957ca9
commit 817593b977
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/intel/boards/tgl_rt1308.c
View File

@ -28,7 +28,7 @@ struct tgl_card_private {
bool common_hdmi_codec_drv;
};
#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
static struct snd_soc_jack tgl_hdmi[4];
struct tgl_hdmi_pcm {
@ -173,6 +173,7 @@ SND_SOC_DAILINK_DEF(dmic_codec,
SND_SOC_DAILINK_DEF(dmic16k,
DAILINK_COMP_ARRAY(COMP_CPU("DMIC16k Pin")));
#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
SND_SOC_DAILINK_DEF(idisp1_pin,
DAILINK_COMP_ARRAY(COMP_CPU("iDisp1 Pin")));
SND_SOC_DAILINK_DEF(idisp1_codec,
@ -192,6 +193,7 @@ SND_SOC_DAILINK_DEF(idisp4_pin,
DAILINK_COMP_ARRAY(COMP_CPU("iDisp4 Pin")));
SND_SOC_DAILINK_DEF(idisp4_codec,
DAILINK_COMP_ARRAY(COMP_CODEC("ehdaudio0D2", "intel-hdmi-hifi4")));
#endif
static struct snd_soc_dai_link tgl_rt1308_dailink[] = {
{
@ -219,7 +221,7 @@ static struct snd_soc_dai_link tgl_rt1308_dailink[] = {
.no_pcm = 1,
SND_SOC_DAILINK_REG(dmic16k, dmic_codec, platform),
},
#if IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI)
#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
{
.name = "iDisp1",
.id = 3,
@ -283,7 +285,7 @@ static int tgl_rt1308_probe(struct platform_device *pdev)
if (!ctx)
return -ENOMEM;
if (IS_ENABLED(CONFIG_SND_SOC_HDAC_HDMI))
if (IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI))
INIT_LIST_HEAD(&ctx->hdmi_pcm_list);
mach = (&pdev->dev)->platform_data;