ASoC: pcm3060: Use modern ASoC DAI format terminology

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

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

diff --git a/sound/soc/codecs/pcm3060.c b/sound/soc/codecs/pcm3060.c
index b235806..4e3bfb9 100644 (file)
--- a/sound/soc/codecs/pcm3060.c
+++ b/sound/soc/codecs/pcm3060.c
@@ -68,15 +68,15 @@ static int pcm3060_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
                return -EINVAL;
        }
 
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
-               priv->dai[dai->id].is_master = true;
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFP:
+               priv->dai[dai->id].is_provider = true;
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:
-               priv->dai[dai->id].is_master = false;
+       case SND_SOC_DAIFMT_CBC_CFC:
+               priv->dai[dai->id].is_provider = false;
                break;
        default:
-               dev_err(comp->dev, "unsupported DAI master mode: 0x%x\n", fmt);
+               dev_err(comp->dev, "unsupported DAI mode: 0x%x\n", fmt);
                return -EINVAL;
        }
 
@@ -116,7 +116,7 @@ static int pcm3060_hw_params(struct snd_pcm_substream *substream,
        unsigned int reg;
        unsigned int val;
 
-       if (!priv->dai[dai->id].is_master) {
+       if (!priv->dai[dai->id].is_provider) {
                val = PCM3060_REG_MS_S;
                goto val_ready;
        }

diff --git a/sound/soc/codecs/pcm3060.h b/sound/soc/codecs/pcm3060.h
index 18d51e5..5e1185e 100644 (file)
--- a/sound/soc/codecs/pcm3060.h
+++ b/sound/soc/codecs/pcm3060.h
@@ -23,7 +23,7 @@ extern const struct regmap_config pcm3060_regmap;
 #define PCM3060_CLK2           2
 
 struct pcm3060_priv_dai {
-       bool is_master;
+       bool is_provider;
        unsigned int sclk_freq;
 };