ASoC: cpcap: Use modern ASoC DAI format terminology

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

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

diff --git a/sound/soc/codecs/cpcap.c b/sound/soc/codecs/cpcap.c
index 05bbacd..598e090 100644 (file)
--- a/sound/soc/codecs/cpcap.c
+++ b/sound/soc/codecs/cpcap.c
@@ -1168,15 +1168,15 @@ static int cpcap_hifi_set_dai_fmt(struct snd_soc_dai *codec_dai,
 
        /*
         * "HiFi Playback" should always be configured as
-        * SND_SOC_DAIFMT_CBM_CFM - codec clk & frm master
+        * SND_SOC_DAIFMT_CBP_CFP - codec clk & frm provider
         * SND_SOC_DAIFMT_I2S - I2S mode
         */
-       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:
                val &= ~BIT(CPCAP_BIT_SMB_ST_DAC);
                break;
        default:
-               dev_err(dev, "HiFi dai fmt failed: CPCAP should be master");
+               dev_err(dev, "HiFi dai fmt failed: CPCAP should be provider");
                return -EINVAL;
        }
 
@@ -1318,15 +1318,15 @@ static int cpcap_voice_set_dai_fmt(struct snd_soc_dai *codec_dai,
 
        /*
         * "Voice Playback" and "Voice Capture" should always be
-        * configured as SND_SOC_DAIFMT_CBM_CFM - codec clk & frm
-        * master
+        * configured as SND_SOC_DAIFMT_CBP_CFP - codec clk & frm
+        * provider
         */
-       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:
                val &= ~BIT(CPCAP_BIT_SMB_CDC);
                break;
        default:
-               dev_err(component->dev, "Voice dai fmt failed: CPCAP should be the master");
+               dev_err(component->dev, "Voice dai fmt failed: CPCAP should be the provider");
                val &= ~BIT(CPCAP_BIT_SMB_CDC);
                break;
        }