ASoC: amd: acp: Remove rt1019_1 codec conf from machine driver

Remove rt1019_1 codec configuration which has i2c-10EC1019:01 and
i2c-10EC1019:02 codec components, Now Using default i2c-10EC1019:00
and i2c-10EC1019:01 codec components.

Signed-off-by: V sujith kumar Reddy <Vsujithkumar.Reddy@amd.com>
Link: https://lore.kernel.org/r/20220707161142.491034-2-Vsujithkumar.Reddy@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c
index 7530cab..8614539 100644 (file)
--- a/sound/soc/amd/acp/acp-mach-common.c
+++ b/sound/soc/amd/acp/acp-mach-common.c
@@ -313,9 +313,6 @@ static const struct snd_soc_ops acp_card_dmic_ops = {
 SND_SOC_DAILINK_DEF(rt1019,
        DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC1019:00", "rt1019-aif"),
                          COMP_CODEC("i2c-10EC1019:01", "rt1019-aif")));
-SND_SOC_DAILINK_DEF(rt1019_1,
-                   DAILINK_COMP_ARRAY(COMP_CODEC("i2c-10EC1019:02", "rt1019-aif"),
-                   COMP_CODEC("i2c-10EC1019:01", "rt1019-aif")));
 
 static const struct snd_soc_dapm_route rt1019_map_lr[] = {
        { "Left Spk", NULL, "Left SPO" },
@@ -333,17 +330,6 @@ static struct snd_soc_codec_conf rt1019_conf[] = {
        },
 };
 
-static struct snd_soc_codec_conf rt1019_1_conf[] = {
-       {
-               .dlc = COMP_CODEC_CONF("i2c-10EC1019:02"),
-               .name_prefix = "Left",
-       },
-       {
-               .dlc = COMP_CODEC_CONF("i2c-10EC1019:01"),
-               .name_prefix = "Right",
-       },
-};
-
 static int acp_card_rt1019_init(struct snd_soc_pcm_runtime *rtd)
 {
        struct snd_soc_card *card = rtd->card;
@@ -716,10 +702,6 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
                        links[i].init = acp_card_rt1019_init;
                        card->codec_conf = rt1019_conf;
                        card->num_configs = ARRAY_SIZE(rt1019_conf);
-                       links[i].codecs = rt1019_1;
-                       links[i].num_codecs = ARRAY_SIZE(rt1019_1);
-                       card->codec_conf = rt1019_1_conf;
-                       card->num_configs = ARRAY_SIZE(rt1019_1_conf);
                }
                i++;
        }