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 v2 08/16] ASoC: imx-audmix: Update to modern clocking terminology
Date: Tue, 21 Sep 2021 22:35:34 +0100 [thread overview]
Message-ID: <20210921213542.31688-8-broonie@kernel.org> (raw)
In-Reply-To: <20210921213542.31688-1-broonie@kernel.org>
As part of moving to remove the old style defines for the bus clocks update
the imx-audmix driver to use more modern terminology for clocking.
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/imx-audmix.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sound/soc/fsl/imx-audmix.c b/sound/soc/fsl/imx-audmix.c
index a364e2415de0..e8b438a0329e 100644
--- a/sound/soc/fsl/imx-audmix.c
+++ b/sound/soc/fsl/imx-audmix.c
@@ -80,8 +80,8 @@ static int imx_audmix_fe_hw_params(struct snd_pcm_substream *substream,
u32 channels = params_channels(params);
int ret, dir;
- /* For playback the AUDMIX is slave, and for record is master */
- fmt |= tx ? SND_SOC_DAIFMT_CBS_CFS : SND_SOC_DAIFMT_CBM_CFM;
+ /* For playback the AUDMIX is consumer, and for record is provider */
+ fmt |= tx ? SND_SOC_DAIFMT_CBC_CFC : SND_SOC_DAIFMT_CBP_CFP;
dir = tx ? SND_SOC_CLOCK_OUT : SND_SOC_CLOCK_IN;
/* set DAI configuration */
@@ -121,8 +121,8 @@ static int imx_audmix_be_hw_params(struct snd_pcm_substream *substream,
if (!tx)
return 0;
- /* For playback the AUDMIX is slave */
- fmt |= SND_SOC_DAIFMT_CBM_CFM;
+ /* For playback the AUDMIX is consumer */
+ fmt |= SND_SOC_DAIFMT_CBP_CFP;
/* set AUDMIX DAI configuration */
ret = snd_soc_dai_set_fmt(asoc_rtd_to_cpu(rtd, 0), fmt);
--
2.20.1
next prev parent reply other threads:[~2021-09-21 21:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-21 21:35 [PATCH v2 01/16] ASoC: eureka-tlv320: Update to modern clocking terminology Mark Brown
2021-09-21 21:35 ` [PATCH v2 02/16] ASoC: fsl-asoc-card: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 03/16] ASoC: fsl-audmix: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 04/16] ASoC: fsl-esai: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 05/16] ASoC: fsl-mqs: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 06/16] ASoC: fsl_sai: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 07/16] ASoC: fsl_ssi: " Mark Brown
2021-09-21 21:35 ` Mark Brown [this message]
2021-09-21 21:35 ` [PATCH v2 09/16] ASoC: imx-card: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 10/16] ASoC: imx-es8328: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 11/16] ASoC: imx-hdmi: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 12/16] ASoC: imx-rpmsg: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 13/16] ASoC: imx-sgtl5000: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 14/16] ASoC: mpc8610_hpcd: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 15/16] ASoC: pl1022_ds: " Mark Brown
2021-09-21 21:35 ` [PATCH v2 16/16] ASoC: pl1022_rdk: " Mark Brown
2021-09-22 0:49 ` [PATCH v2 01/16] ASoC: eureka-tlv320: " Fabio Estevam
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=20210921213542.31688-8-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).