ASoC: ab8500: Update to modern clocking terminology

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

Signed-off-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20210916141335.43818-1-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 5525e1c..aefafb0 100644 (file)
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -2104,26 +2104,26 @@ static int ab8500_codec_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                        BIT(AB8500_DIGIFCONF3_IF0MASTER);
        val = 0;
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM: /* codec clk & FRM master */
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFP:
                dev_dbg(dai->component->dev,
-                       "%s: IF0 Master-mode: AB8500 master.\n", __func__);
+                       "%s: IF0 Master-mode: AB8500 provider.\n", __func__);
                val |= BIT(AB8500_DIGIFCONF3_IF0MASTER);
                break;
-       case SND_SOC_DAIFMT_CBS_CFS: /* codec clk & FRM slave */
+       case SND_SOC_DAIFMT_CBC_CFC:
                dev_dbg(dai->component->dev,
-                       "%s: IF0 Master-mode: AB8500 slave.\n", __func__);
+                       "%s: IF0 Master-mode: AB8500 consumer.\n", __func__);
                break;
-       case SND_SOC_DAIFMT_CBS_CFM: /* codec clk slave & FRM master */
-       case SND_SOC_DAIFMT_CBM_CFS: /* codec clk master & frame slave */
+       case SND_SOC_DAIFMT_CBC_CFP:
+       case SND_SOC_DAIFMT_CBP_CFC:
                dev_err(dai->component->dev,
-                       "%s: ERROR: The device is either a master or a slave.\n",
+                       "%s: ERROR: The device is either a provider or a consumer.\n",
                        __func__);
                fallthrough;
        default:
                dev_err(dai->component->dev,
-                       "%s: ERROR: Unsupporter master mask 0x%x\n",
-                       __func__, fmt & SND_SOC_DAIFMT_MASTER_MASK);
+                       "%s: ERROR: Unsupporter clocking mask 0x%x\n",
+                       __func__, fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK);
                return -EINVAL;
        }