Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ac97-mfd', 'asoc/topic...

[mirror_ubuntu-focal-kernel.git] / sound / soc / intel / boards / bytcht_da7213.c

diff --git a/sound/soc/intel/boards/bytcht_da7213.c b/sound/soc/intel/boards/bytcht_da7213.c
index 18873e23f404b1aec4f5ef05a8483887529fc309..c4d82ad41bd70b432ee82b327f6ce5ccd76024e5 100644 (file)
--- a/sound/soc/intel/boards/bytcht_da7213.c
+++ b/sound/soc/intel/boards/bytcht_da7213.c
@@ -27,9 +27,9 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
+#include <sound/soc-acpi.h>
 #include "../../codecs/da7213.h"
 #include "../atom/sst-atom-controls.h"
-#include "../common/sst-acpi.h"
 
 static const struct snd_kcontrol_new controls[] = {
        SOC_DAPM_PIN_SWITCH("Headphone Jack"),
@@ -185,19 +185,11 @@ static struct snd_soc_dai_link dailink[] = {
                .dpcm_playback = 1,
                .ops = &aif1_ops,
        },
-       [MERR_DPCM_COMPR] = {
-               .name = "Compressed Port",
-               .stream_name = "Compress",
-               .cpu_dai_name = "compress-cpu-dai",
-               .codec_dai_name = "snd-soc-dummy-dai",
-               .codec_name = "snd-soc-dummy",
-               .platform_name = "sst-mfld-platform",
-       },
        /* CODEC<->CODEC link */
        /* back ends */
        {
                .name = "SSP2-Codec",
-               .id = 1,
+               .id = 0,
                .cpu_dai_name = "ssp2-port",
                .platform_name = "sst-mfld-platform",
                .no_pcm = 1,
@@ -231,19 +223,18 @@ static char codec_name[16]; /* i2c-<HID>:00 with HID being 8 chars */
 
 static int bytcht_da7213_probe(struct platform_device *pdev)
 {
-       int ret_val = 0;
-       int i;
        struct snd_soc_card *card;
-       struct sst_acpi_mach *mach;
+       struct snd_soc_acpi_mach *mach;
        const char *i2c_name = NULL;
        int dai_index = 0;
+       int ret_val = 0;
+       int i;
 
        mach = (&pdev->dev)->platform_data;
        card = &bytcht_da7213_card;
        card->dev = &pdev->dev;
 
        /* fix index of codec dai */
-       dai_index = MERR_DPCM_COMPR + 1;
        for (i = 0; i < ARRAY_SIZE(dailink); i++) {
                if (!strcmp(dailink[i].codec_name, "i2c-DLGS7213:00")) {
                        dai_index = i;
@@ -252,8 +243,8 @@ static int bytcht_da7213_probe(struct platform_device *pdev)
        }
 
        /* fixup codec name based on HID */
-       i2c_name = sst_acpi_find_name_from_hid(mach->id);
-       if (i2c_name != NULL) {
+       i2c_name = snd_soc_acpi_find_name_from_hid(mach->id);
+       if (i2c_name) {
                snprintf(codec_name, sizeof(codec_name),
                        "%s%s", "i2c-", i2c_name);
                dailink[dai_index].codec_name = codec_name;