ASoC: Intel: sof_rt5682: use common module for amp link

[linux-2.6-microblaze.git] / sound / soc / intel / boards / sof_rt5682.c

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 8adc828..777d1db 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -666,13 +666,12 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec codec_type,
 
        /* speaker amp */
        if (amp_type != CODEC_NONE) {
-               links[id].name = devm_kasprintf(dev, GFP_KERNEL,
-                                               "SSP%d-Codec", ssp_amp);
-               if (!links[id].name)
-                       goto devm_err;
-
-               links[id].id = id;
+               ret = sof_intel_board_set_ssp_amp_link(dev, &links[id], id,
+                                                      amp_type, ssp_amp);
+               if (ret)
+                       return NULL;
 
+               /* codec-specific fields */
                switch (amp_type) {
                case CODEC_MAX98357A:
                        max_98357a_dai_link(&links[id]);
@@ -713,29 +712,6 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec codec_type,
                        return NULL;
                }
 
-               links[id].platforms = platform_component;
-               links[id].num_platforms = ARRAY_SIZE(platform_component);
-               links[id].dpcm_playback = 1;
-               /* feedback stream or firmware-generated echo reference */
-               links[id].dpcm_capture = 1;
-
-               links[id].no_pcm = 1;
-               links[id].cpus = &cpus[id];
-               links[id].num_cpus = 1;
-               if (is_legacy_cpu) {
-                       links[id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
-                                                                 "ssp%d-port",
-                                                                 ssp_amp);
-                       if (!links[id].cpus->dai_name)
-                               goto devm_err;
-
-               } else {
-                       links[id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
-                                                                 "SSP%d Pin",
-                                                                 ssp_amp);
-                       if (!links[id].cpus->dai_name)
-                               goto devm_err;
-               }
                id++;
        }
 
@@ -801,7 +777,7 @@ static int sof_audio_probe(struct platform_device *pdev)
        struct snd_soc_acpi_mach *mach = pdev->dev.platform_data;
        struct snd_soc_dai_link *dai_links;
        struct sof_card_private *ctx;
-       int ret, ssp_amp;
+       int ret;
 
        ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
        if (!ctx)
@@ -867,7 +843,7 @@ static int sof_audio_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "sof_rt5682_quirk = %lx\n", sof_rt5682_quirk);
 
-       ssp_amp = (sof_rt5682_quirk & SOF_RT5682_SSP_AMP_MASK) >>
+       ctx->ssp_amp = (sof_rt5682_quirk & SOF_RT5682_SSP_AMP_MASK) >>
                        SOF_RT5682_SSP_AMP_SHIFT;
 
        ctx->ssp_codec = sof_rt5682_quirk & SOF_RT5682_SSP_CODEC_MASK;
@@ -887,8 +863,9 @@ static int sof_audio_probe(struct platform_device *pdev)
                                        SOF_NO_OF_HDMI_CAPTURE_SSP_SHIFT);
 
        dai_links = sof_card_dai_links_create(&pdev->dev, ctx->codec_type,
-                                             ctx->amp_type, ctx->ssp_codec, ssp_amp,
-                                             ctx->dmic_be_num, ctx->hdmi_num,
+                                             ctx->amp_type, ctx->ssp_codec,
+                                             ctx->ssp_amp, ctx->dmic_be_num,
+                                             ctx->hdmi_num,
                                              ctx->hdmi.idisp_codec,
                                              ctx->rt5682.is_legacy_cpu);
        if (!dai_links)