From: Nicolin Chen <nicoleotsuka@gmail.com>
To: timur@tabi.org, broonie@kernel.org
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
alsa-devel@alsa-project.org, lgirdwood@gmail.com,
fabio.estevam@nxp.com, mail@maciej.szmigiero.name,
caleb@crome.org, arnaud.mouiche@invoxia.com, lukma@denx.de,
kernel@pengutronix.de
Subject: [PATCH v1 10/15] ASoC: fsl_ssi: Move one-time configurations to dai_probe()
Date: Tue, 19 Dec 2017 09:00:14 -0800 [thread overview]
Message-ID: <1513702819-42310-11-git-send-email-nicoleotsuka@gmail.com> (raw)
In-Reply-To: <1513702819-42310-1-git-send-email-nicoleotsuka@gmail.com>
The dai_probe() could handle some one-time configurations since
they will not be changed once being configured.
Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
---
sound/soc/fsl/fsl_ssi.c | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index fd756dd..4673709 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -855,7 +855,6 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,
{
struct regmap *regs = ssi->regs;
u32 strcr = 0, stcr, srcr, scr, mask;
- u8 wm;
ssi->dai_fmt = fmt;
@@ -864,8 +863,6 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,
return -EINVAL;
}
- fsl_ssi_setup_regvals(ssi);
-
regmap_read(regs, REG_SSI_SCR, &scr);
scr &= ~(SSI_SCR_SYN | SSI_SCR_I2S_MODE_MASK);
/* Synchronize frame sync clock for TE to avoid data slipping */
@@ -980,16 +977,6 @@ static int _fsl_ssi_set_dai_fmt(struct device *dev,
regmap_write(regs, REG_SSI_SRCR, srcr);
regmap_write(regs, REG_SSI_SCR, scr);
- wm = ssi->fifo_watermark;
-
- regmap_write(regs, REG_SSI_SFCSR,
- SSI_SFCSR_TFWM0(wm) | SSI_SFCSR_RFWM0(wm) |
- SSI_SFCSR_TFWM1(wm) | SSI_SFCSR_RFWM1(wm));
-
- if (ssi->use_dual_fifo)
- regmap_update_bits(regs, REG_SSI_SCR,
- SSI_SCR_TCH_EN, SSI_SCR_TCH_EN);
-
if ((fmt & SND_SOC_DAIFMT_FORMAT_MASK) == SND_SOC_DAIFMT_AC97)
fsl_ssi_setup_ac97(ssi);
@@ -1096,14 +1083,31 @@ static int fsl_ssi_trigger(struct snd_pcm_substream *substream, int cmd,
return 0;
}
+/**
+ * Set DMA data and one-time configurations
+ */
static int fsl_ssi_dai_probe(struct snd_soc_dai *dai)
{
struct fsl_ssi *ssi = snd_soc_dai_get_drvdata(dai);
+ u32 wm = ssi->fifo_watermark;
if (ssi->soc->imx && ssi->use_dma)
snd_soc_dai_init_dma_data(dai, &ssi->dma_params_tx,
&ssi->dma_params_rx);
+ /* Initialize regvals */
+ fsl_ssi_setup_regvals(ssi);
+
+ /* Set watermarks */
+ regmap_write(ssi->regs, REG_SSI_SFCSR,
+ SSI_SFCSR_TFWM0(wm) | SSI_SFCSR_RFWM0(wm) |
+ SSI_SFCSR_TFWM1(wm) | SSI_SFCSR_RFWM1(wm));
+
+ /* Enable Dual FIFO mode */
+ if (ssi->use_dual_fifo)
+ regmap_update_bits(ssi->regs, REG_SSI_SCR,
+ SSI_SCR_TCH_EN, SSI_SCR_TCH_EN);
+
return 0;
}
--
2.7.4
next prev parent reply other threads:[~2017-12-19 17:01 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-19 17:00 [PATCH v1 00/15] ASoC: fsl_ssi: Clean up - program flow level Nicolin Chen
2017-12-19 17:00 ` [PATCH v1 01/15] ASoC: fsl_ssi: Clean up set_dai_tdm_slot() Nicolin Chen
2018-01-01 18:39 ` Maciej S. Szmigiero
2018-01-04 19:08 ` Nicolin Chen
2018-02-22 13:17 ` Applied "ASoC: fsl_ssi: Clean up set_dai_tdm_slot()" to the asoc tree Mark Brown
2017-12-19 17:00 ` [PATCH v1 02/15] ASoC: fsl_ssi: Maintain a mask of active streams Nicolin Chen
2017-12-19 17:00 ` [PATCH v1 03/15] ASoC: fsl_ssi: Rename fsl_ssi_disable_val macro Nicolin Chen
2018-01-01 21:29 ` Maciej S. Szmigiero
2018-01-04 19:42 ` Nicolin Chen
2017-12-19 17:00 ` [PATCH v1 04/15] ASoC: fsl_ssi: Clear FIFO directly in fsl_ssi_config() Nicolin Chen
2017-12-19 17:00 ` [PATCH v1 05/15] ASoC: fsl_ssi: Clean up helper functions of trigger() Nicolin Chen
2018-01-01 21:59 ` Maciej S. Szmigiero
2018-01-04 19:44 ` Nicolin Chen
2017-12-19 17:00 ` [PATCH v1 06/15] ASoC: fsl_ssi: Add DAIFMT define for AC97 Nicolin Chen
2018-02-22 13:16 ` Applied "ASoC: fsl_ssi: Add DAIFMT define for AC97" to the asoc tree Mark Brown
2017-12-19 17:00 ` [PATCH v1 07/15] ASoC: fsl_ssi: Clean up fsl_ssi_setup_regvals() Nicolin Chen
2018-02-22 13:16 ` Applied "ASoC: fsl_ssi: Clean up fsl_ssi_setup_regvals()" to the asoc tree Mark Brown
2017-12-19 17:00 ` [PATCH v1 08/15] ASoC: fsl_ssi: Set xFEN0 and xFEN1 together Nicolin Chen
2018-02-22 13:16 ` Applied "ASoC: fsl_ssi: Set xFEN0 and xFEN1 together" to the asoc tree Mark Brown
2017-12-19 17:00 ` [PATCH v1 09/15] ASoC: fsl_ssi: Use snd_soc_init_dma_data instead Nicolin Chen
2018-02-22 13:16 ` Applied "ASoC: fsl_ssi: Use snd_soc_init_dma_data instead" to the asoc tree Mark Brown
2017-12-19 17:00 ` Nicolin Chen [this message]
2017-12-19 17:00 ` [PATCH v1 11/15] ASoC: fsl_ssi: Setup AC97 in dai_probe() Nicolin Chen
2018-01-01 15:17 ` Maciej S. Szmigiero
2018-01-04 19:07 ` Nicolin Chen
2018-01-04 20:38 ` Maciej S. Szmigiero
2018-01-04 20:58 ` Nicolin Chen
2017-12-19 17:00 ` [PATCH v1 12/15] ASoC: fsl_ssi: Clean up _fsl_ssi_set_dai_fmt() Nicolin Chen
2017-12-19 17:00 ` [PATCH v1 13/15] ASoC: fsl_ssi: Remove cpu_dai_drv from fsl_ssi structure Nicolin Chen
2017-12-19 17:00 ` [PATCH v1 14/15] ASoC: fsl_ssi: Move DT related code to a separate probe() Nicolin Chen
2017-12-19 17:00 ` [PATCH v1 15/15] ASoC: fsl_ssi: Use ssi->streams instead of reading register Nicolin Chen
2017-12-19 17:34 ` [PATCH v1 00/15] ASoC: fsl_ssi: Clean up - program flow level Timur Tabi
2018-01-02 23:28 ` Caleb Crome
2018-01-04 19:48 ` Nicolin Chen
2018-01-04 19:50 ` Caleb Crome
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=1513702819-42310-11-git-send-email-nicoleotsuka@gmail.com \
--to=nicoleotsuka@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnaud.mouiche@invoxia.com \
--cc=broonie@kernel.org \
--cc=caleb@crome.org \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=lukma@denx.de \
--cc=mail@maciej.szmigiero.name \
--cc=timur@tabi.org \
/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).