ASoC: max98927: Use modern ASoC DAI format terminology

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

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

diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c
index fd84780bf689f6c84a1b074a52d1020052e278ac..bf78d3c9851494ded4c4b21bede4aee6cddf6b34 100644 (file)
--- a/sound/soc/codecs/max98927.c
+++ b/sound/soc/codecs/max98927.c
@@ -148,12 +148,13 @@ static int max98927_dai_set_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
 
        dev_dbg(component->dev, "%s: fmt 0x%08X\n", __func__, fmt);
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBS_CFS:
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBC_CFC:
+               max98927->provider = false;
                mode = MAX98927_PCM_MASTER_MODE_SLAVE;
                break;
-       case SND_SOC_DAIFMT_CBM_CFM:
-               max98927->master = true;
+       case SND_SOC_DAIFMT_CBP_CFP:
+               max98927->provider = true;
                mode = MAX98927_PCM_MASTER_MODE_MASTER;
                break;
        default:
@@ -270,7 +271,7 @@ static int max98927_set_clock(struct max98927_priv *max98927,
        int blr_clk_ratio = params_channels(params) * max98927->ch_size;
        int value;
 
-       if (max98927->master) {
+       if (max98927->provider) {
                int i;
                /* match rate to closest value */
                for (i = 0; i < ARRAY_SIZE(rate_table); i++) {

diff --git a/sound/soc/codecs/max98927.h b/sound/soc/codecs/max98927.h
index 13f5066d74196a4c501c22e35d2a32af71e4cfb0..2353910f5f175385e8a205373e0778a38b2eb679 100644 (file)
--- a/sound/soc/codecs/max98927.h
+++ b/sound/soc/codecs/max98927.h
@@ -264,7 +264,7 @@ struct max98927_priv {
        unsigned int ch_size;
        unsigned int rate;
        unsigned int iface;
-       unsigned int master;
+       unsigned int provider;
        unsigned int digital_gain;
        bool tdm_mode;
 };