Skip to content

Kconfig: add CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC dependent#1989

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

Merged
kv2019i merged 3 commits into from
Apr 20, 2020
Merged

Kconfig: add CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC dependent #1989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
530f943
ASoC: intel: add depends on SND_SOC_SOF_HDA_AUDIO_CODEC for common hdmi
libinyang Apr 14, 2020
2b0402a
ASoC: sof-sdw: remove CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC condition
libinyang Apr 5, 2020
4f6e51b
ASoC: sof_pcm512x: remove CONFIG_SND_HDA_CODEC_HDMI condition
libinyang Apr 6, 2020
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
20 changes: 10 additions & 10 deletions sound/soc/intel/boards/Kconfig
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -413,13 +413,13 @@ config SND_SOC_INTEL_KBL_RT5660_MACH

endif ## SND_SOC_INTEL_KBL

if SND_SOC_SOF_GEMINILAKE && SND_SOC_SOF_HDA_LINK
if SND_SOC_SOF_GEMINILAKE

config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
tristate "GLK with DA7219 and MAX98357A in I2S Mode"
depends on I2C && ACPI && GPIOLIB
depends on MFD_INTEL_LPSS || COMPILE_TEST
depends on SND_HDA_CODEC_HDMI
depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
Comment thread
kv2019i marked this conversation as resolved.
select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
help
This adds support for ASoC machine driver for Geminilake platforms
Expand All@@ -431,7 +431,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
tristate "GLK with RT5682 and MAX98357A in I2S Mode"
depends on I2C && ACPI && GPIOLIB
depends on MFD_INTEL_LPSS || COMPILE_TEST
depends on SND_HDA_CODEC_HDMI
depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
Comment thread
kv2019i marked this conversation as resolved.
select SND_SOC_RT5682
select SND_SOC_MAX98357A
select SND_SOC_DMIC
Expand All@@ -442,7 +442,7 @@ config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
Say Y if you have such a device.
If unsure select "N".

endif ## SND_SOC_SOF_GEMINILAKE && SND_SOC_SOF_HDA_LINK
endif ## SND_SOC_SOF_GEMINILAKE

if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC

Expand All@@ -465,9 +465,9 @@ 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 && GPIOLIB
depends on (SND_SOC_SOF_HDA_LINK && (MFD_INTEL_LPSS || COMPILE_TEST)) ||\
depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\
(MFD_INTEL_LPSS || COMPILE_TEST)) ||\
(SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))
depends on SND_HDA_CODEC_HDMI
select SND_SOC_MAX98373
select SND_SOC_RT1015
select SND_SOC_RT5682
Expand DownExpand Up@@ -511,7 +511,7 @@ config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH
tristate "CML with RT1011 and RT5682 in I2S Mode"
depends on I2C && ACPI && GPIOLIB
depends on MFD_INTEL_LPSS || COMPILE_TEST
depends on SND_HDA_CODEC_HDMI
depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
Comment thread
kv2019i marked this conversation as resolved.
select SND_SOC_RT1011
select SND_SOC_RT5682
select SND_SOC_DMIC
Expand All@@ -530,7 +530,7 @@ config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH
tristate "SOF with DA7219 and MAX98373/MAX98360A in I2S Mode"
depends on I2C && ACPI && GPIOLIB
depends on MFD_INTEL_LPSS || COMPILE_TEST
depends on SND_HDA_CODEC_HDMI
depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
Comment thread
kv2019i marked this conversation as resolved.
select SND_SOC_DA7219
select SND_SOC_MAX98373
select SND_SOC_DMIC
Expand All@@ -548,7 +548,7 @@ config SND_SOC_INTEL_EHL_RT5660_MACH
tristate "EHL with RT5660 in I2S mode"
depends on I2C && ACPI && GPIOLIB
depends on MFD_INTEL_LPSS || COMPILE_TEST
depends on SND_HDA_CODEC_HDMI
depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
Comment thread
kv2019i marked this conversation as resolved.
select SND_SOC_RT5660
select SND_SOC_DMIC
help
Expand All@@ -565,7 +565,7 @@ config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
depends on MFD_INTEL_LPSS || COMPILE_TEST
depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST
depends on SOUNDWIRE
depends on SND_HDA_CODEC_HDMI
depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
Comment thread
kv2019i marked this conversation as resolved.
select SND_SOC_RT700_SDW
select SND_SOC_RT711_SDW
select SND_SOC_RT1308_SDW
Expand Down
9 changes: 0 additions & 9 deletions sound/soc/intel/boards/sof_pcm512x.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,6 @@ static struct snd_soc_dai_link_component platform_component[] = {
}
};

#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
static int sof_card_late_probe(struct snd_soc_card *card)
{
struct sof_card_private *ctx = snd_soc_card_get_drvdata(card);
Expand All@@ -146,12 +145,6 @@ static int sof_card_late_probe(struct snd_soc_card *card)

return hda_dsp_hdmi_build_controls(card, pcm->codec_dai->component);
}
#else
static int sof_card_late_probe(struct snd_soc_card *card)
{
return 0;
}
#endif

static const struct snd_kcontrol_new sof_controls[] = {
SOC_DAPM_PIN_SWITCH("Ext Spk"),
Expand DownExpand Up@@ -374,14 +367,12 @@ static int sof_audio_probe(struct platform_device *pdev)
sof_pcm512x_quirk = SOF_PCM512X_SSP_CODEC(2);
} else {
dmic_be_num = 2;
#if IS_ENABLED(CONFIG_SND_HDA_CODEC_HDMI)
if (mach->mach_params.common_hdmi_codec_drv &&
(mach->mach_params.codec_mask & IDISP_CODEC_MASK))
ctx->idisp_codec = true;

/* links are always present in topology */
hdmi_num = 3;
#endif
}

dmi_check_system(sof_pcm512x_quirk_table);
Expand Down
8 changes: 0 additions & 8 deletions sound/soc/intel/boards/sof_sdw.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -663,9 +663,7 @@ static int sof_card_dai_links_create(struct device *dev,
struct snd_soc_card *card)
{
int ssp_num, sdw_be_num = 0, hdmi_num = 0, dmic_num;
#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
Comment thread
plbossart marked this conversation as resolved.
struct snd_soc_dai_link_component *idisp_components;
#endif
struct snd_soc_dai_link_component *ssp_components;
struct snd_soc_acpi_mach_params *mach_params;
const struct snd_soc_acpi_link_adr *adr_link;
Expand All@@ -686,10 +684,8 @@ 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_AUDIO_CODEC)
hdmi_num = sof_sdw_quirk & SOF_SDW_TGL_HDMI ?
SOF_TGL_HDMI_COUNT : SOF_PRE_TGL_HDMI_COUNT;
#endif

ssp_mask = SOF_SSP_GET_PORT(sof_sdw_quirk);
/*
Expand DownExpand Up@@ -849,7 +845,6 @@ static int sof_card_dai_links_create(struct device *dev,
INC_ID(be_id, cpu_id, link_id);
}

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
/* HDMI */
if (hdmi_num > 0) {
idisp_components = devm_kcalloc(dev, hdmi_num,
Expand DownExpand Up@@ -886,7 +881,6 @@ static int sof_card_dai_links_create(struct device *dev,
sof_sdw_hdmi_init, NULL);
INC_ID(be_id, cpu_id, link_id);
}
#endif

card->dai_link = links;
card->num_links = num_links;
Expand DownExpand Up@@ -919,9 +913,7 @@ static int mc_probe(struct platform_device *pdev)

dmi_check_system(sof_sdw_quirk_table);

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

card->dev = &pdev->dev;

Expand Down
7 changes: 0 additions & 7 deletions sound/soc/intel/boards/sof_sdw_hdmi.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,7 +16,6 @@
#include "../../codecs/hdac_hdmi.h"
#include "hda_dsp_common.h"

#if IS_ENABLED(CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC)
static struct snd_soc_jack hdmi[MAX_HDMI_NUM];

struct hdmi_pcm {
Expand DownExpand Up@@ -89,9 +88,3 @@ int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card)

return hdac_hdmi_jack_port_init(component, &card->dapm);
}
#else
int sof_sdw_hdmi_card_late_probe(struct snd_soc_card *card)
{
return 0;
}
#endif