ASoC: imx-audmix: Update to modern clocking terminology

As part of moving to remove the old style defines for the bus clocks update
the imx-audmix driver to use more modern terminology for clocking.

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
Link: https://lore.kernel.org/r/20210921213542.31688-8-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c
index 0d637929bfef9e872466b51f639f84cb216eb61a..502fe1b522aba7420aeee0ccc1fa8425b2f8ba1e 100644 (file)
--- a/sound/soc/fsl/imx-audmix.c
+++ b/sound/soc/fsl/imx-audmix.c
@@ -80,8 +80,8 @@ static int imx_audmix_fe_hw_params(struct snd_pcm_substream *substream,
        u32 channels = params_channels(params);
        int ret, dir;
 
-       /* For playback the AUDMIX is slave, and for record is master */
-       fmt |= tx ? SND_SOC_DAIFMT_CBS_CFS : SND_SOC_DAIFMT_CBM_CFM;
+       /* For playback the AUDMIX is consumer, and for record is provider */
+       fmt |= tx ? SND_SOC_DAIFMT_CBC_CFC : SND_SOC_DAIFMT_CBP_CFP;
        dir  = tx ? SND_SOC_CLOCK_OUT : SND_SOC_CLOCK_IN;
 
        /* set DAI configuration */
@@ -121,8 +121,8 @@ static int imx_audmix_be_hw_params(struct snd_pcm_substream *substream,
        if (!tx)
                return 0;
 
-       /* For playback the AUDMIX is slave */
-       fmt |= SND_SOC_DAIFMT_CBM_CFM;
+       /* For playback the AUDMIX is consumer */
+       fmt |= SND_SOC_DAIFMT_CBP_CFP;
 
        /* set AUDMIX DAI configuration */
        ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), fmt);