ASoC: fsl: remove dpcm_xxx flags

dpcm_xxx flags are no longer needed. It converts dpcm_xxx flag to
xxx_only if needed.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87iktm9vij.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index a0c2ce84c32b1d06b160c7283285ebd90358bfe7..02e1594e8223c920f9d9250a75932cbb14914258 100644 (file)
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -317,8 +317,6 @@ static const struct snd_soc_dai_link fsl_asoc_card_dai[] = {
        {
                .name = "HiFi-ASRC-FE",
                .stream_name = "HiFi-ASRC-FE",
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .dynamic = 1,
        },
        {
@@ -326,8 +324,6 @@ static const struct snd_soc_dai_link fsl_asoc_card_dai[] = {
                .stream_name = "HiFi-ASRC-BE",
                .be_hw_params_fixup = be_hw_params_fixup,
                .ops = &fsl_asoc_card_ops,
-               .dpcm_playback = 1,
-               .dpcm_capture = 1,
                .no_pcm = 1,
        },
 };
@@ -504,13 +500,13 @@ static int fsl_asoc_card_spdif_init(struct device_node *codec_np[],
        }
 
        if (priv->dai_link[0].playback_only) {
-               priv->dai_link[1].dpcm_capture = false;
-               priv->dai_link[2].dpcm_capture = false;
+               priv->dai_link[1].playback_only = true;
+               priv->dai_link[2].playback_only = true;
                priv->card.dapm_routes = audio_map_tx;
                priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx);
        } else if (priv->dai_link[0].capture_only) {
-               priv->dai_link[1].dpcm_playback = false;
-               priv->dai_link[2].dpcm_playback = false;
+               priv->dai_link[1].capture_only = true;
+               priv->dai_link[2].capture_only = true;
                priv->card.dapm_routes = audio_map_rx;
                priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_rx);
        }
@@ -764,8 +760,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
        } else if (of_device_is_compatible(np, "fsl,imx-audio-tlv320aic31xx")) {
                codec_dai_name[0] = "tlv320dac31xx-hifi";
                priv->dai_fmt |= SND_SOC_DAIFMT_CBS_CFS;
-               priv->dai_link[1].dpcm_capture = 0;
-               priv->dai_link[2].dpcm_capture = 0;
+               priv->dai_link[1].playback_only = 1;
+               priv->dai_link[2].playback_only = 1;
                priv->cpu_priv.sysclk_dir[TX] = SND_SOC_CLOCK_OUT;
                priv->cpu_priv.sysclk_dir[RX] = SND_SOC_CLOCK_OUT;
                priv->card.dapm_routes = audio_map_tx;
@@ -791,15 +787,15 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
                priv->dai_fmt = SND_SOC_DAIFMT_LEFT_J |
                                SND_SOC_DAIFMT_CBC_CFC |
                                SND_SOC_DAIFMT_NB_NF;
-               priv->dai_link[1].dpcm_capture = 0;
-               priv->dai_link[2].dpcm_capture = 0;
+               priv->dai_link[1].playback_only = 1;
+               priv->dai_link[2].playback_only = 1;
                priv->card.dapm_routes = audio_map_tx;
                priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx);
        } else if (of_device_is_compatible(np, "fsl,imx-audio-wm8524")) {
                codec_dai_name[0] = "wm8524-hifi";
                priv->dai_fmt |= SND_SOC_DAIFMT_CBC_CFC;
-               priv->dai_link[1].dpcm_capture = 0;
-               priv->dai_link[2].dpcm_capture = 0;
+               priv->dai_link[1].playback_only = 1;
+               priv->dai_link[2].playback_only = 1;
                priv->cpu_priv.slot_width = 32;
                priv->card.dapm_routes = audio_map_tx;
                priv->card.num_dapm_routes = ARRAY_SIZE(audio_map_tx);

diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c
index 6fbcf33fd0dea6373b0a104d1654013882e274ca..dcf770b55c4bd42f4d8f5a3b9b2c7bb4aa5f6973 100644 (file)
--- a/sound/soc/fsl/imx-audmix.c
+++ b/sound/soc/fsl/imx-audmix.c
@@ -264,11 +264,10 @@ static int imx_audmix_probe(struct platform_device *pdev)
                priv->dai[i].cpus->dai_name = name[1][i];
 
                priv->dai[i].dynamic = 1;
-               priv->dai[i].dpcm_playback = 1;
-               if (i == num_dai - 1) {
-                       priv->dai[i].dpcm_capture = 1;
-                       priv->dai[i].dpcm_playback = 0;
-               }
+               if (i == num_dai - 1)
+                       priv->dai[i].capture_only  = 1;
+               else
+                       priv->dai[i].playback_only = 1;
                priv->dai[i].ignore_pmdown_time = 1;
                priv->dai[i].ops = &imx_audmix_fe_ops;
 
@@ -285,11 +284,10 @@ static int imx_audmix_probe(struct platform_device *pdev)
                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].no_pcm = 1;
-               priv->dai[num_dai + i].dpcm_playback = 1;
-               if (i == num_dai - 1) {
-                       priv->dai[num_dai + i].dpcm_capture  = 1;
-                       priv->dai[num_dai + i].dpcm_playback  = 0;
-               }
+               if (i == num_dai - 1)
+                       priv->dai[num_dai + i].capture_only  = 1;
+               else
+                       priv->dai[num_dai + i].playback_only = 1;
                priv->dai[num_dai + i].ignore_pmdown_time = 1;
                priv->dai[num_dai + i].ops = &imx_audmix_be_ops;
 

diff --git a/sound/soc/fsl/imx-card.c b/sound/soc/fsl/imx-card.c
index 306168b164d397c774bb89f98735fe859ec05633..0f11f20dc51a432ae89e53bbc005251bbfd83044 100644 (file)
--- a/sound/soc/fsl/imx-card.c
+++ b/sound/soc/fsl/imx-card.c
@@ -860,8 +860,8 @@ static int imx_card_probe(struct platform_device *pdev)
                }
                for_each_card_prelinks(&data->card, i, link) {
                        if (link->dynamic == 1 && link_be) {
-                               link->dpcm_playback = link_be->dpcm_playback;
-                               link->dpcm_capture = link_be->dpcm_capture;
+                               link->playback_only = link_be->playback_only;
+                               link->capture_only  = link_be->capture_only;
                        }
                }
        }