All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org, Mark Brown <broonie@kernel.org>
Subject: [PATCH 20/20] ASoC: tlv320dac3x: Use modern ASoC DAI format terminology
Date: Thu,  2 Jun 2022 15:53:16 +0200	[thread overview]
Message-ID: <20220602135316.3554400-21-broonie@kernel.org> (raw)
In-Reply-To: <20220602135316.3554400-1-broonie@kernel.org>

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>
---
 sound/soc/codecs/tlv320dac33.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 66f1d1cd6cf0..371026eb8f41 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -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);
-- 
2.30.2


  parent reply	other threads:[~2022-06-02 13:59 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-02 13:52 [PATCH 00/20] ASoC: DAI clocking terminology modernisation Mark Brown
2022-06-02 13:52 ` [PATCH 01/20] ASoC: cx2072x: Use modern ASoC DAI format terminology Mark Brown
2022-06-02 13:52 ` [PATCH 02/20] ASoC: max98090: " Mark Brown
2022-06-02 13:52 ` [PATCH 03/20] ASoC: rk3328: " Mark Brown
2022-06-02 13:53 ` [PATCH 04/20] ASoC: sta32x: " Mark Brown
2022-06-02 13:53 ` [PATCH 05/20] ASoC: sta350: " Mark Brown
2022-06-02 13:53 ` [PATCH 06/20] ASoC: sti-sas: " Mark Brown
2022-06-02 13:53 ` [PATCH 07/20] ASoC: tas2552: " Mark Brown
2022-06-02 13:53 ` [PATCH 08/20] ASoC: tas2770: " Mark Brown
2022-06-02 13:53 ` [PATCH 09/20] ASoC: tas5086: " Mark Brown
2022-06-02 13:53 ` [PATCH 10/20] ASoC: tas5720: " Mark Brown
2022-06-02 13:53 ` [PATCH 11/20] ASoC: tas6424: " Mark Brown
2022-06-02 13:53 ` [PATCH 12/20] ASoC: uda1334: " Mark Brown
2022-06-02 13:53 ` [PATCH 13/20] ASoC: tlv320adc3xxx: " Mark Brown
2022-06-02 13:53 ` [PATCH 14/20] ASoC: tlv320adcx140: " Mark Brown
2022-06-02 13:53 ` [PATCH 15/20] ASoC: tlv320aic23: " Mark Brown
2022-06-02 20:00   ` kernel test robot
2022-06-02 20:00     ` kernel test robot
2022-06-02 13:53 ` [PATCH 16/20] ASoC: tlv320aic26: " Mark Brown
2022-06-03  9:08   ` kernel test robot
2022-06-03  9:08     ` kernel test robot
2022-06-02 13:53 ` [PATCH 17/20] ASoC: tlv320aic31xx: " Mark Brown
2022-06-02 13:53 ` [PATCH 18/20] ASoC: tlv320aic32x4: " Mark Brown
2022-06-02 13:53 ` [PATCH 19/20] ASoC: tlv320aic33: " Mark Brown
2022-06-02 13:53 ` Mark Brown [this message]
2022-06-08 10:49 ` [PATCH 00/20] ASoC: DAI clocking terminology modernisation Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220602135316.3554400-21-broonie@kernel.org \
    --to=broonie@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=lgirdwood@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.