]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: fsl: imx-audmix: don't select unnecessary Platform
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Wed, 19 Jun 2019 01:17:10 +0000 (10:17 +0900)
committerMark Brown <broonie@kernel.org>
Wed, 19 Jun 2019 11:51:29 +0000 (12:51 +0100)
ALSA SoC is now supporting "no Platform". Sound card doesn't need to
select "CPU component" as "Platform" anymore if it doesn't need
special Platform.
This patch removes such settings.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/fsl/imx-audmix.c

index 9e1cb18859ce6a585a2956dc11737ebc7978f466..9d41266a5264d9c3fc2b09d038a303493c9415ee 100644 (file)
@@ -207,8 +207,8 @@ static int imx_audmix_probe(struct platform_device *pdev)
        for (i = 0; i < num_dai; i++) {
                struct snd_soc_dai_link_component *dlc;
 
-               /* for CPU/Codec/Platform x 2 */
-               dlc = devm_kzalloc(&pdev->dev, 6 * sizeof(*dlc), GFP_KERNEL);
+               /* for CPU/Codec x 2 */
+               dlc = devm_kzalloc(&pdev->dev, 4 * sizeof(*dlc), GFP_KERNEL);
                if (!dlc) {
                        dev_err(&pdev->dev, "failed to allocate dai_link\n");
                        return -ENOMEM;
@@ -242,11 +242,9 @@ static int imx_audmix_probe(struct platform_device *pdev)
 
                priv->dai[i].cpus = &dlc[0];
                priv->dai[i].codecs = &dlc[1];
-               priv->dai[i].platforms = &dlc[2];
 
                priv->dai[i].num_cpus = 1;
                priv->dai[i].num_codecs = 1;
-               priv->dai[i].num_platforms = 1;
 
                priv->dai[i].name = dai_name;
                priv->dai[i].stream_name = "HiFi-AUDMIX-FE";
@@ -254,7 +252,6 @@ static int imx_audmix_probe(struct platform_device *pdev)
                priv->dai[i].codecs->name = "snd-soc-dummy";
                priv->dai[i].cpus->of_node = args.np;
                priv->dai[i].cpus->dai_name = dev_name(&cpu_pdev->dev);
-               priv->dai[i].platforms->of_node = args.np;
                priv->dai[i].dynamic = 1;
                priv->dai[i].dpcm_playback = 1;
                priv->dai[i].dpcm_capture = (i == 0 ? 1 : 0);
@@ -269,20 +266,17 @@ static int imx_audmix_probe(struct platform_device *pdev)
                be_cp = devm_kasprintf(&pdev->dev, GFP_KERNEL,
                                       "AUDMIX-Capture-%d", i);
 
-               priv->dai[num_dai + i].cpus = &dlc[3];
-               priv->dai[num_dai + i].codecs = &dlc[4];
-               priv->dai[num_dai + i].platforms = &dlc[5];
+               priv->dai[num_dai + i].cpus = &dlc[2];
+               priv->dai[num_dai + i].codecs = &dlc[3];
 
                priv->dai[num_dai + i].num_cpus = 1;
                priv->dai[num_dai + i].num_codecs = 1;
-               priv->dai[num_dai + i].num_platforms = 1;
 
                priv->dai[num_dai + i].name = be_name;
                priv->dai[num_dai + i].codecs->dai_name = "snd-soc-dummy-dai";
                priv->dai[num_dai + i].codecs->name = "snd-soc-dummy";
                priv->dai[num_dai + i].cpus->of_node = audmix_np;
                priv->dai[num_dai + i].cpus->dai_name = be_name;
-               priv->dai[num_dai + i].platforms->name = "snd-soc-dummy";
                priv->dai[num_dai + i].no_pcm = 1;
                priv->dai[num_dai + i].dpcm_playback = 1;
                priv->dai[num_dai + i].dpcm_capture  = 1;