Skip to content

ASoC: Intel: sdw_rt711_rt1308_rt715: fix HDMI support #1797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kv2019i wants to merge 1 commit into from
Closed

ASoC: Intel: sdw_rt711_rt1308_rt715: fix HDMI support #1797

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions sound/soc/intel/boards/sdw_rt711_rt1308_rt715.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ struct codec_info {
bool playback);
};

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC)
#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
static struct snd_soc_jack hdmi[3];

struct hdmi_pcm {
Expand Down Expand Up @@ -766,7 +766,7 @@ static int sof_card_dai_links_create(struct device *dev,
for (i = 0; i < ARRAY_SIZE(codec_info_list); i++)
codec_info_list[i].amp_num = 0;

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC)
#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
hdmi_num = sof_rt711_rt1308_rt715_quirk & SOF_SDW_TGL_HDMI ?
SOF_TGL_HDMI_COUNT : SOF_PRE_TGL_HDMI_COUNT;
#endif
Expand Down Expand Up @@ -866,7 +866,7 @@ static int sof_card_dai_links_create(struct device *dev,
dmic_component, 1, dmic_init, NULL);
}

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC)
#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
/* HDMI */
if (hdmi_num > 0) {
idisp_components = devm_kcalloc(dev, hdmi_num,
Expand Down Expand Up @@ -941,7 +941,7 @@ static int mc_probe(struct platform_device *pdev)

dmi_check_system(sof_sdw_rt711_rt1308_rt715_quirk_table);

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC)
#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
INIT_LIST_HEAD(&ctx->hdmi_pcm_list);
#endif

Expand Down