ASoC: tlv320aic32x4: Use modern ASoC DAI format terminology
authorMark Brown <broonie@kernel.org>
Thu, 2 Jun 2022 13:53:14 +0000 (15:53 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 6 Jun 2022 12:09:19 +0000 (13:09 +0100)
As part of moving to remove the old style defines for the bus clocks update
the tlv320aic32x4 driver to use more modern terminology for clocking.

Signed-off-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20220602135316.3554400-19-broonie@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/tlv320aic32x4.c

index 8f42fd7..a8e6adf 100644 (file)
@@ -615,15 +615,14 @@ static int aic32x4_set_dai_fmt(struct snd_soc_dai *codec_dai, unsigned int fmt)
        u8 iface_reg_2 = 0;
        u8 iface_reg_3 = 0;
 
-       /* set master/slave audio interface */
-       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:
                iface_reg_1 |= AIC32X4_BCLKMASTER | AIC32X4_WCLKMASTER;
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:
+       case SND_SOC_DAIFMT_CBC_CFC:
                break;
        default:
-               printk(KERN_ERR "aic32x4: invalid DAI master/slave interface\n");
+               printk(KERN_ERR "aic32x4: invalid clock provider\n");
                return -EINVAL;
        }