ASoC: rockchip: rk3399_gru_sound: 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/87a5a98owz.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
index 6c89c7331229f0ac86b29f3bffb05f6623c98067..c8137e8883c40bccbf0e1dd358799f41b07a895a 100644 (file)
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -338,7 +338,7 @@ static const struct snd_soc_dai_link rockchip_dais[] = {
                .stream_name = "DP PCM",
                .init = rockchip_sound_cdndp_init,
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                       SND_SOC_DAIFMT_CBS_CFS,
+                       SND_SOC_DAIFMT_CBC_CFC,
                SND_SOC_DAILINK_REG(cdndp),
        },
        [DAILINK_DA7219] = {
@@ -348,7 +348,7 @@ static const struct snd_soc_dai_link rockchip_dais[] = {
                .ops = &rockchip_sound_da7219_ops,
                /* set da7219 as slave */
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                       SND_SOC_DAIFMT_CBS_CFS,
+                       SND_SOC_DAIFMT_CBC_CFC,
                SND_SOC_DAILINK_REG(da7219),
        },
        [DAILINK_DMIC] = {
@@ -356,7 +356,7 @@ static const struct snd_soc_dai_link rockchip_dais[] = {
                .stream_name = "DMIC PCM",
                .ops = &rockchip_sound_dmic_ops,
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                       SND_SOC_DAIFMT_CBS_CFS,
+                       SND_SOC_DAIFMT_CBC_CFC,
                SND_SOC_DAILINK_REG(dmic),
        },
        [DAILINK_MAX98357A] = {
@@ -365,7 +365,7 @@ static const struct snd_soc_dai_link rockchip_dais[] = {
                .ops = &rockchip_sound_max98357a_ops,
                /* set max98357a as slave */
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                       SND_SOC_DAIFMT_CBS_CFS,
+                       SND_SOC_DAIFMT_CBC_CFC,
                SND_SOC_DAILINK_REG(max98357a),
        },
        [DAILINK_RT5514] = {
@@ -374,7 +374,7 @@ static const struct snd_soc_dai_link rockchip_dais[] = {
                .ops = &rockchip_sound_rt5514_ops,
                /* set rt5514 as slave */
                .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |
-                       SND_SOC_DAIFMT_CBS_CFS,
+                       SND_SOC_DAIFMT_CBC_CFC,
                SND_SOC_DAILINK_REG(rt5514),
        },
        /* RT5514 DSP for voice wakeup via spi bus */