ASoC: sof_pcm512x: remove CONFIG_SND_HDA_CODEC_HDMI condition
As CONFIG_SND_HDA_CODEC_HDMI is always enabled in sof_pcm512x, let's remove the test of CONFIG_SND_HDA_CODEC_HDMI in the sof_pcm512x driver. Signed-off-by: Libin Yang <libin.yang@linux.intel.com> Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Link: https://lore.kernel.org/r/20200529193547.6077-4-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
38acab2d61
commit
1e7cb64b0a
|
@ -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);
|
||||
|
@ -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"),
|
||||
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue