ASoC: amd: use use new trigger ordering method

ASoC is now supporting generic trigger ordering method.
This patch switch to use it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/87pm66fnzi.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/amd/acp-da7219-max98357a.c b/sound/soc/amd/acp-da7219-max98357a.c
index 375417bd7d6e1a6bcc05e74ff9f5d7f56ec3b884..7464ca2b596c7c4c30282ff4a400a8d896df3798 100644 (file)
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
@@ -524,7 +524,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                                | SND_SOC_DAIFMT_CBP_CFP,
                .init = cz_da7219_init,
                .dpcm_playback = 1,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_da7219_play_ops,
                SND_SOC_DAILINK_REG(designware1, dlgs, platform),
        },
@@ -534,7 +534,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_da7219_cap_ops,
                SND_SOC_DAILINK_REG(designware2, dlgs, platform),
        },
@@ -544,7 +544,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_playback = 1,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_max_play_ops,
                SND_SOC_DAILINK_REG(designware3, mx, platform),
        },
@@ -555,7 +555,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_dmic0_cap_ops,
                SND_SOC_DAILINK_REG(designware3, adau, platform),
        },
@@ -566,7 +566,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_dmic1_cap_ops,
                SND_SOC_DAILINK_REG(designware2, adau, platform),
        },
@@ -580,7 +580,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                                | SND_SOC_DAIFMT_CBP_CFP,
                .init = cz_rt5682_init,
                .dpcm_playback = 1,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_rt5682_play_ops,
                SND_SOC_DAILINK_REG(designware1, rt5682, platform),
        },
@@ -590,7 +590,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_rt5682_cap_ops,
                SND_SOC_DAILINK_REG(designware2, rt5682, platform),
        },
@@ -600,7 +600,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_playback = 1,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_rt5682_max_play_ops,
                SND_SOC_DAILINK_REG(designware3, mx, platform),
        },
@@ -611,7 +611,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_rt5682_dmic0_cap_ops,
                SND_SOC_DAILINK_REG(designware3, adau, platform),
        },
@@ -622,7 +622,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .ops = &cz_rt5682_dmic1_cap_ops,
                SND_SOC_DAILINK_REG(designware2, adau, platform),
        },

diff --git a/sound/soc/amd/acp-es8336.c b/sound/soc/amd/acp-es8336.c
index 89499542c803fedf33beb06495e8a4403e415b67..5e56d3a53be7836a7db4cedc9d1b1c4d16bd88e7 100644 (file)
--- a/sound/soc/amd/acp-es8336.c
+++ b/sound/soc/amd/acp-es8336.c
@@ -149,7 +149,7 @@ static struct snd_soc_dai_link st_dai_es8336[] = {
                .stream_name = "ES8336 HiFi Play",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
                                | SND_SOC_DAIFMT_CBP_CFP,
-               .stop_dma_first = 1,
+               .trigger_stop = SND_SOC_TRIGGER_ORDER_LDC,
                .dpcm_capture = 1,
                .dpcm_playback = 1,
                .init = st_es8336_init,