ASoC: max98390: Use modern ASoC DAI format terminology

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

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

diff --git a/sound/soc/codecs/max98390.c b/sound/soc/codecs/max98390.c
index d1882cbc9381dec1a0a927f923d618b5f3163176..40fd6f363f35687552b21ac67eced7e9b687c0f2 100644 (file)
--- a/sound/soc/codecs/max98390.c
+++ b/sound/soc/codecs/max98390.c
@@ -174,12 +174,12 @@ static int max98390_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:
                mode = MAX98390_PCM_MASTER_MODE_SLAVE;
                break;
-       case SND_SOC_DAIFMT_CBM_CFM:
-               max98390->master = true;
+       case SND_SOC_DAIFMT_CBP_CFP:
+               max98390->provider = true;
                mode = MAX98390_PCM_MASTER_MODE_MASTER;
                break;
        default:
@@ -265,7 +265,7 @@ static int max98390_set_clock(struct snd_soc_component *component,
                * snd_pcm_format_width(params_format(params));
        int value;
 
-       if (max98390->master) {
+       if (max98390->provider) {
                int i;
                /* match rate to closest value */
                for (i = 0; i < ARRAY_SIZE(rate_table); i++) {

diff --git a/sound/soc/codecs/max98390.h b/sound/soc/codecs/max98390.h
index c250740f73a2712568024c9c97e1f73fad88ecb4..f4d6758ab4c630a187715747a069295b26567165 100644 (file)
--- a/sound/soc/codecs/max98390.h
+++ b/sound/soc/codecs/max98390.h
@@ -656,7 +656,7 @@
 struct max98390_priv {
        struct regmap *regmap;
        unsigned int sysclk;
-       unsigned int master;
+       unsigned int provider;
        unsigned int tdm_mode;
        unsigned int v_l_slot;
        unsigned int i_l_slot;