ASoC: mediatek: mt8365-dai-i2s: use inclusive language for SND_SOC_DAIFMT_CBx_CFx

In SND_SOC_DAIFMT_CBx_CFx, M/S are no longer used. use P/C.

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

diff --git a/sound/soc/mediatek/mt8365/mt8365-dai-i2s.c b/sound/soc/mediatek/mt8365/mt8365-dai-i2s.c
index 11b9a5bc716382ec139a1da9382b563ac9d1e3e0..cae51756cead819b0f104ce3a3f7c76e0e346022 100644 (file)
--- a/sound/soc/mediatek/mt8365/mt8365-dai-i2s.c
+++ b/sound/soc/mediatek/mt8365/mt8365-dai-i2s.c
@@ -313,7 +313,7 @@ static int mt8365_dai_set_config(struct mtk_base_afe *afe,
        }
 
        if ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK) ==
-           SND_SOC_DAIFMT_CBM_CFM) {
+           SND_SOC_DAIFMT_CBP_CFP) {
                val |= AFE_I2S_CON_SRC_SLAVE;
                val &= ~(u32)AFE_I2S_CON_FROM_IO_MUX;//from consys
        }
@@ -523,7 +523,7 @@ static int mt8365_dai_i2s_startup(struct snd_pcm_substream *substream,
        bool i2s_in_slave =
                (substream->stream == SNDRV_PCM_STREAM_CAPTURE) &&
                ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK) ==
-               SND_SOC_DAIFMT_CBM_CFM);
+               SND_SOC_DAIFMT_CBP_CFP);
 
        mt8365_afe_enable_main_clk(afe);
 
@@ -551,7 +551,7 @@ static void mt8365_dai_i2s_shutdown(struct snd_pcm_substream *substream,
        bool i2s_in_slave =
                (substream->stream == SNDRV_PCM_STREAM_CAPTURE) &&
                ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK) ==
-               SND_SOC_DAIFMT_CBM_CFM);
+               SND_SOC_DAIFMT_CBP_CFP);
 
        if (be->prepared[substream->stream]) {
                if (reset_i2s_out_change)
@@ -613,7 +613,7 @@ static int mt8365_dai_i2s_prepare(struct snd_pcm_substream *substream,
 
        if (apply_i2s_in_change) {
                if ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK)
-                   == SND_SOC_DAIFMT_CBM_CFM) {
+                   == SND_SOC_DAIFMT_CBP_CFP) {
                        ret = mt8365_afe_set_2nd_i2s_asrc(afe, 32000, rate,
                                                          (unsigned int)bit_width,
                                                          0, 0, 1);
@@ -659,7 +659,7 @@ static int mt8365_dai_i2s_prepare(struct snd_pcm_substream *substream,
                mt8365_dai_set_enable(afe, i2s_data, true, true);
 
                if ((be->fmt_mode & SND_SOC_DAIFMT_MASTER_MASK)
-                   == SND_SOC_DAIFMT_CBM_CFM)
+                   == SND_SOC_DAIFMT_CBP_CFP)
                        mt8365_afe_set_2nd_i2s_asrc_enable(afe, true);
 
                be->prepared[SNDRV_PCM_STREAM_CAPTURE] = true;
@@ -712,7 +712,7 @@ static int mt8365_afe_2nd_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 
        be->fmt_mode |= (fmt & SND_SOC_DAIFMT_INV_MASK);
 
-       if (((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBM_CFM))
+       if (((fmt & SND_SOC_DAIFMT_MASTER_MASK) == SND_SOC_DAIFMT_CBP_CFP))
                be->fmt_mode |= (fmt & SND_SOC_DAIFMT_MASTER_MASK);
 
        return 0;