ASoC: tlv320aic33: Use modern ASoC DAI format terminology

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

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220602135316.3554400-20-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c
index d53037b1509d0969dca2b46f3db7b495e29721b1..610e41bbf388cd334e35fc9d928745080e30baa5 100644 (file)
--- a/sound/soc/codecs/tlv320aic3x.c
+++ b/sound/soc/codecs/tlv320aic3x.c
@@ -1253,22 +1253,21 @@ static int aic3x_set_dai_fmt(struct snd_soc_dai *codec_dai,
        iface_areg = snd_soc_component_read(component, AIC3X_ASD_INTF_CTRLA) & 0x3f;
        iface_breg = snd_soc_component_read(component, AIC3X_ASD_INTF_CTRLB) & 0x3f;
 
-       /* set master/slave audio interface */
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFP:
                aic3x->master = 1;
                iface_areg |= BIT_CLK_MASTER | WORD_CLK_MASTER;
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:
+       case SND_SOC_DAIFMT_CBC_CFC:
                aic3x->master = 0;
                iface_areg &= ~(BIT_CLK_MASTER | WORD_CLK_MASTER);
                break;
-       case SND_SOC_DAIFMT_CBM_CFS:
+       case SND_SOC_DAIFMT_CBP_CFC:
                aic3x->master = 1;
                iface_areg |= BIT_CLK_MASTER;
                iface_areg &= ~WORD_CLK_MASTER;
                break;
-       case SND_SOC_DAIFMT_CBS_CFM:
+       case SND_SOC_DAIFMT_CBC_CFP:
                aic3x->master = 1;
                iface_areg |= WORD_CLK_MASTER;
                iface_areg &= ~BIT_CLK_MASTER;