]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: tlv320dac3x: Use modern ASoC DAI format terminology
authorMark Brown <broonie@kernel.org>
Thu, 2 Jun 2022 13:53:16 +0000 (15:53 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 6 Jun 2022 12:09:21 +0000 (13:09 +0100)
As part of moving to remove the old style defines for the bus clocks update
the tlv320dac3x driver to use more modern terminology for clocking.

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

index 66f1d1cd6cf005ef3b00a73ac07fa1593b271215..371026eb8f41b2df92901560107fec7cebc18770 100644 (file)
@@ -1317,16 +1317,14 @@ static int dac33_set_dai_fmt(struct snd_soc_dai *codec_dai,
 
        aictrl_a = dac33_read_reg_cache(component, DAC33_SER_AUDIOIF_CTRL_A);
        aictrl_b = dac33_read_reg_cache(component, DAC33_SER_AUDIOIF_CTRL_B);
-       /* set master/slave audio interface */
-       switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-       case SND_SOC_DAIFMT_CBM_CFM:
-               /* Codec Master */
+
+       switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+       case SND_SOC_DAIFMT_CBP_CFP:
                aictrl_a |= (DAC33_MSBCLK | DAC33_MSWCLK);
                break;
-       case SND_SOC_DAIFMT_CBS_CFS:
-               /* Codec Slave */
+       case SND_SOC_DAIFMT_CBC_CFC:
                if (dac33->fifo_mode) {
-                       dev_err(component->dev, "FIFO mode requires master mode\n");
+                       dev_err(component->dev, "FIFO mode requires provider mode\n");
                        return -EINVAL;
                } else
                        aictrl_a &= ~(DAC33_MSBCLK | DAC33_MSWCLK);