All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
To: Liam Girdwood <lgirdwood@gmail.com>,
	Nicolin Chen <nicoleotsuka@gmail.com>,
	Xiubo Li <Xiubo.Lee@gmail.com>,
	Fabio Estevam <festevam@gmail.com>,
	Shengjiu Wang <shengjiu.wang@gmail.com>
Cc: alsa-devel@alsa-project.org, Mark Brown <broonie@kernel.org>,
	linuxppc-dev@lists.ozlabs.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 03/16] ASoC: fsl-audmix: Update to modern clocking terminology
Date: Tue, 21 Sep 2021 22:10:27 +0100	[thread overview]
Message-ID: <20210921211040.11624-3-broonie@kernel.org> (raw)
In-Reply-To: <20210921211040.11624-1-broonie@kernel.org>

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

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/fsl/fsl_audmix.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c
index f931288e256c..db2dde597edc 100644
--- a/sound/soc/fsl/fsl_audmix.c
+++ b/sound/soc/fsl/fsl_audmix.c
@@ -257,10 +257,10 @@ static int fsl_audmix_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 		return -EINVAL;
 	}
 
-	/* For playback the AUDMIX is slave, and for record is master */
-	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-	case SND_SOC_DAIFMT_CBM_CFM:
-	case SND_SOC_DAIFMT_CBS_CFS:
+	/* For playback the AUDMIX is provider, and for record is consumer */
+	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+	case SND_SOC_DAIFMT_CBP_CFP:
+	case SND_SOC_DAIFMT_CBC_CFC:
 		break;
 	default:
 		return -EINVAL;
-- 
2.20.1


WARNING: multiple messages have this Message-ID (diff)
From: Mark Brown <broonie@kernel.org>
To: Liam Girdwood <lgirdwood@gmail.com>,
	Nicolin Chen <nicoleotsuka@gmail.com>,
	Xiubo Li <Xiubo.Lee@gmail.com>,
	Fabio Estevam <festevam@gmail.com>,
	Shengjiu Wang <shengjiu.wang@gmail.com>
Cc: alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org,
	linux-arm-kernel@lists.infradead.org,
	Mark Brown <broonie@kernel.org>
Subject: [PATCH 03/16] ASoC: fsl-audmix: Update to modern clocking terminology
Date: Tue, 21 Sep 2021 22:10:27 +0100	[thread overview]
Message-ID: <20210921211040.11624-3-broonie@kernel.org> (raw)
In-Reply-To: <20210921211040.11624-1-broonie@kernel.org>

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

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/fsl/fsl_audmix.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sound/soc/fsl/fsl_audmix.c b/sound/soc/fsl/fsl_audmix.c
index f931288e256c..db2dde597edc 100644
--- a/sound/soc/fsl/fsl_audmix.c
+++ b/sound/soc/fsl/fsl_audmix.c
@@ -257,10 +257,10 @@ static int fsl_audmix_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 		return -EINVAL;
 	}
 
-	/* For playback the AUDMIX is slave, and for record is master */
-	switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) {
-	case SND_SOC_DAIFMT_CBM_CFM:
-	case SND_SOC_DAIFMT_CBS_CFS:
+	/* For playback the AUDMIX is provider, and for record is consumer */
+	switch (fmt & SND_SOC_DAIFMT_CLOCK_PROVIDER_MASK) {
+	case SND_SOC_DAIFMT_CBP_CFP:
+	case SND_SOC_DAIFMT_CBC_CFC:
 		break;
 	default:
 		return -EINVAL;
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-09-21 21:13 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-21 21:10 [PATCH 01/16] ASoC: eureka-tlv320: Update to modern clocking terminology Mark Brown
2021-09-21 21:10 ` Mark Brown
2021-09-21 21:10 ` [PATCH 02/16] ASoC: fsl-asoc-card: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` Mark Brown [this message]
2021-09-21 21:10   ` [PATCH 03/16] ASoC: fsl-audmix: " Mark Brown
2021-09-21 21:22   ` Fabio Estevam
2021-09-21 21:22     ` Fabio Estevam
2021-09-21 21:24     ` Mark Brown
2021-09-21 21:24       ` Mark Brown
2021-09-21 21:10 ` [PATCH 04/16] ASoC: fsl-esai: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 05/16] ASoC: fsl-mqs: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 06/16] ASoC: fsl_sai: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 07/16] ASoC: fsl_ssi: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 08/16] ASoC: imx-audmix: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 09/16] ASoC: imx-card: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 10/16] ASoC: imx-es8328: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 11/16] ASoC: imx-hdmi: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 12/16] ASoC: imx-rpmsg: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 13/16] ASoC: imx-sgtl5000: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 14/16] ASoC: mpc8610_hpcd: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 15/16] ASoC: pl1022_ds: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-21 21:10 ` [PATCH 16/16] ASoC: pl1022_rdk: " Mark Brown
2021-09-21 21:10   ` Mark Brown
2021-09-22 14:21 ` [PATCH 01/16] ASoC: eureka-tlv320: " Mark Brown
2021-09-22 14:21   ` 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=20210921211040.11624-3-broonie@kernel.org \
    --to=broonie@kernel.org \
    --cc=Xiubo.Lee@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=festevam@gmail.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=nicoleotsuka@gmail.com \
    --cc=shengjiu.wang@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.