ASoC: amd: Convert to new style DAI format definitions

Convert the AMD machine drivers to use the new style defines for clocking
in DAI formats.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20210915180957.39996-1-broonie@kernel.org
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 b2065f3..3bf86c2 100644 (file)
--- a/sound/soc/amd/acp-da7219-max98357a.c
+++ b/sound/soc/amd/acp-da7219-max98357a.c
@@ -522,7 +522,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .name = "amd-da7219-play",
                .stream_name = "Playback",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .init = cz_da7219_init,
                .dpcm_playback = 1,
                .stop_dma_first = 1,
@@ -533,7 +533,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .name = "amd-da7219-cap",
                .stream_name = "Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
                .stop_dma_first = 1,
                .ops = &cz_da7219_cap_ops,
@@ -543,7 +543,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .name = "amd-max98357-play",
                .stream_name = "HiFi Playback",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_playback = 1,
                .stop_dma_first = 1,
                .ops = &cz_max_play_ops,
@@ -554,7 +554,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .name = "dmic0",
                .stream_name = "DMIC0 Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
                .stop_dma_first = 1,
                .ops = &cz_dmic0_cap_ops,
@@ -565,7 +565,7 @@ static struct snd_soc_dai_link cz_dai_7219_98357[] = {
                .name = "dmic1",
                .stream_name = "DMIC1 Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
                .stop_dma_first = 1,
                .ops = &cz_dmic1_cap_ops,
@@ -578,7 +578,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .name = "amd-rt5682-play",
                .stream_name = "Playback",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .init = cz_rt5682_init,
                .dpcm_playback = 1,
                .stop_dma_first = 1,
@@ -589,7 +589,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .name = "amd-rt5682-cap",
                .stream_name = "Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
                .stop_dma_first = 1,
                .ops = &cz_rt5682_cap_ops,
@@ -599,7 +599,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .name = "amd-max98357-play",
                .stream_name = "HiFi Playback",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_playback = 1,
                .stop_dma_first = 1,
                .ops = &cz_rt5682_max_play_ops,
@@ -610,7 +610,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .name = "dmic0",
                .stream_name = "DMIC0 Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
                .stop_dma_first = 1,
                .ops = &cz_rt5682_dmic0_cap_ops,
@@ -621,7 +621,7 @@ static struct snd_soc_dai_link cz_dai_5682_98357[] = {
                .name = "dmic1",
                .stream_name = "DMIC1 Capture",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .dpcm_capture = 1,
                .stop_dma_first = 1,
                .ops = &cz_rt5682_dmic1_cap_ops,

diff --git a/sound/soc/amd/acp-rt5645.c b/sound/soc/amd/acp-rt5645.c
index 6d5c547..a79a466 100644 (file)
--- a/sound/soc/amd/acp-rt5645.c
+++ b/sound/soc/amd/acp-rt5645.c
@@ -111,7 +111,7 @@ static struct snd_soc_dai_link cz_dai_rt5650[] = {
                .name = "amd-rt5645-play",
                .stream_name = "RT5645_AIF1",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .init = cz_init,
                .ops = &cz_aif1_ops,
                SND_SOC_DAILINK_REG(designware1, codec, platform),
@@ -120,7 +120,7 @@ static struct snd_soc_dai_link cz_dai_rt5650[] = {
                .name = "amd-rt5645-cap",
                .stream_name = "RT5645_AIF1",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .ops = &cz_aif1_ops,
                SND_SOC_DAILINK_REG(designware2, codec, platform),
        },

diff --git a/sound/soc/amd/acp3x-rt5682-max9836.c b/sound/soc/amd/acp3x-rt5682-max9836.c
index e561464..dad7043 100644 (file)
--- a/sound/soc/amd/acp3x-rt5682-max9836.c
+++ b/sound/soc/amd/acp3x-rt5682-max9836.c
@@ -51,7 +51,7 @@ static int acp3x_5682_init(struct snd_soc_pcm_runtime *rtd)
        /* set rt5682 dai fmt */
        ret =  snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_I2S
                        | SND_SOC_DAIFMT_NB_NF
-                       | SND_SOC_DAIFMT_CBM_CFM);
+                       | SND_SOC_DAIFMT_CBP_CFP);
        if (ret < 0) {
                dev_err(rtd->card->dev,
                                "Failed to set rt5682 dai fmt: %d\n", ret);
@@ -302,7 +302,7 @@ static struct snd_soc_dai_link acp3x_dai[] = {
                .name = "acp3x-5682-play",
                .stream_name = "Playback",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBM_CFM,
+                               | SND_SOC_DAIFMT_CBP_CFP,
                .init = acp3x_5682_init,
                .dpcm_playback = 1,
                .dpcm_capture = 1,
@@ -313,7 +313,7 @@ static struct snd_soc_dai_link acp3x_dai[] = {
                .name = "acp3x-max98357-play",
                .stream_name = "HiFi Playback",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBS_CFS,
+                               | SND_SOC_DAIFMT_CBC_CFC,
                .dpcm_playback = 1,
                .ops = &acp3x_max_play_ops,
                .cpus = acp3x_bt,
@@ -325,7 +325,7 @@ static struct snd_soc_dai_link acp3x_dai[] = {
                .name = "acp3x-ec-dmic0-capture",
                .stream_name = "Capture DMIC0",
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF
-                               | SND_SOC_DAIFMT_CBS_CFS,
+                               | SND_SOC_DAIFMT_CBC_CFC,
                .dpcm_capture = 1,
                .ops = &acp3x_ec_cap0_ops,
                SND_SOC_DAILINK_REG(acp3x_bt, cros_ec, platform),