Commit b6019b58 authored by Brent Lu's avatar Brent Lu Committed by Mark Brown

ASoC: Intel: sof_da7219: remove hdac-hdmi support

Remove hdac-hdmi support code since we are now using
snd-hda-codec-hdmi codec driver for hdmi.
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: default avatarBrent Lu <brent.lu@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20231012190826.142619-9-pierre-louis.bossart@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 8e7377d6
...@@ -27,13 +27,11 @@ ...@@ -27,13 +27,11 @@
struct hdmi_pcm { struct hdmi_pcm {
struct list_head head; struct list_head head;
struct snd_soc_dai *codec_dai; struct snd_soc_dai *codec_dai;
int device;
}; };
struct card_private { struct card_private {
struct snd_soc_jack headset_jack; struct snd_soc_jack headset_jack;
struct list_head hdmi_pcm_list; struct list_head hdmi_pcm_list;
struct snd_soc_jack hdmi[3];
enum sof_ssp_codec codec_type; enum sof_ssp_codec codec_type;
enum sof_ssp_codec amp_type; enum sof_ssp_codec amp_type;
...@@ -238,7 +236,6 @@ static int hdmi_init(struct snd_soc_pcm_runtime *rtd) ...@@ -238,7 +236,6 @@ static int hdmi_init(struct snd_soc_pcm_runtime *rtd)
if (!pcm) if (!pcm)
return -ENOMEM; return -ENOMEM;
pcm->device = dai->id;
pcm->codec_dai = dai; pcm->codec_dai = dai;
list_add_tail(&pcm->head, &ctx->hdmi_pcm_list); list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
...@@ -249,17 +246,10 @@ static int hdmi_init(struct snd_soc_pcm_runtime *rtd) ...@@ -249,17 +246,10 @@ static int hdmi_init(struct snd_soc_pcm_runtime *rtd)
static int card_late_probe(struct snd_soc_card *card) static int card_late_probe(struct snd_soc_card *card)
{ {
struct card_private *ctx = snd_soc_card_get_drvdata(card); struct card_private *ctx = snd_soc_card_get_drvdata(card);
struct snd_soc_acpi_mach *mach = (card->dev)->platform_data;
struct hdmi_pcm *pcm; struct hdmi_pcm *pcm;
if (mach->mach_params.common_hdmi_codec_drv) { pcm = list_first_entry(&ctx->hdmi_pcm_list, struct hdmi_pcm, head);
pcm = list_first_entry(&ctx->hdmi_pcm_list, struct hdmi_pcm, return hda_dsp_hdmi_build_controls(card, pcm->codec_dai->component);
head);
return hda_dsp_hdmi_build_controls(card,
pcm->codec_dai->component);
}
return -EINVAL;
} }
SND_SOC_DAILINK_DEF(ssp0_pin, SND_SOC_DAILINK_DEF(ssp0_pin,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment