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: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Brent Lu <brent.lu@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20231012190826.142619-9-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_da7219.c b/sound/soc/intel/boards/sof_da7219.c
index f21482c..03131cb 100644 (file)
--- a/sound/soc/intel/boards/sof_da7219.c
+++ b/sound/soc/intel/boards/sof_da7219.c
@@ -27,13 +27,11 @@
 struct hdmi_pcm {
        struct list_head head;
        struct snd_soc_dai *codec_dai;
-       int device;
 };
 
 struct card_private {
        struct snd_soc_jack headset_jack;
        struct list_head hdmi_pcm_list;
-       struct snd_soc_jack hdmi[3];
        enum sof_ssp_codec codec_type;
        enum sof_ssp_codec amp_type;
 
@@ -238,7 +236,6 @@ static int hdmi_init(struct snd_soc_pcm_runtime *rtd)
        if (!pcm)
                return -ENOMEM;
 
-       pcm->device = dai->id;
        pcm->codec_dai = dai;
 
        list_add_tail(&pcm->head, &ctx->hdmi_pcm_list);
@@ -249,17 +246,10 @@ static int hdmi_init(struct snd_soc_pcm_runtime *rtd)
 static int card_late_probe(struct snd_soc_card *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;
 
-       if (mach->mach_params.common_hdmi_codec_drv) {
-               pcm = list_first_entry(&ctx->hdmi_pcm_list, struct hdmi_pcm,
-                                      head);
-               return hda_dsp_hdmi_build_controls(card,
-                                                  pcm->codec_dai->component);
-       }
-
-       return -EINVAL;
+       pcm = list_first_entry(&ctx->hdmi_pcm_list, struct hdmi_pcm, head);
+       return hda_dsp_hdmi_build_controls(card, pcm->codec_dai->component);
 }
 
 SND_SOC_DAILINK_DEF(ssp0_pin,