ASoC: cx2072x: Use modern ASoC DAI format terminology

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

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

diff --git a/sound/soc/codecs/cx2072x.c b/sound/soc/codecs/cx2072x.c
index b35debb5818db6bad0decca33a12e66c282b72a7..b6667e8a6099946bf81bb0a6e7f121bd6bbd9fde 100644 (file)
--- a/sound/soc/codecs/cx2072x.c
+++ b/sound/soc/codecs/cx2072x.c
@@ -710,22 +710,19 @@ static int cx2072x_config_i2spcm(struct cx2072x_priv *cx2072x)
 
        regdbt2.ulval = 0xac;
 
-       /* set master/slave */
-       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:
                reg2.r.tx_master = 1;
                reg3.r.rx_master = 1;
-               dev_dbg(dev, "Sets Master mode\n");
                break;
 
-       case SND_SOC_DAIFMT_CBS_CFS:
+       case SND_SOC_DAIFMT_CBC_CFC:
                reg2.r.tx_master = 0;
                reg3.r.rx_master = 0;
-               dev_dbg(dev, "Sets Slave mode\n");
                break;
 
        default:
-               dev_err(dev, "Unsupported DAI master mode\n");
+               dev_err(dev, "Unsupported DAI clocking mode\n");
                return -EINVAL;
        }
 
@@ -1009,9 +1006,9 @@ static int cx2072x_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 
        dev_dbg(dev, "set_dai_fmt- %08x\n", fmt);
        /* set master/slave */
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
-       case SND_SOC_DAIFMT_CBS_CFS:
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFP:
+       case SND_SOC_DAIFMT_CBC_CFC:
                break;
 
        default: