All of lore.kernel.org
 help / color / mirror / Atom feed
From: Nicolin Chen <nicoleotsuka@gmail.com>
To: timur@tabi.org, broonie@kernel.org, mail@maciej.szmigiero.name
Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
	alsa-devel@alsa-project.org, lgirdwood@gmail.com,
	fabio.estevam@nxp.com, caleb@crome.org,
	arnaud.mouiche@invoxia.com, lukma@denx.de, kernel@pengutronix.de
Subject: [PATCH v2 08/16] ASoC: fsl_ssi: Clean up fsl_ssi_setup_regvals()
Date: Wed, 10 Jan 2018 22:43:07 -0800	[thread overview]
Message-ID: <1515652995-15996-9-git-send-email-nicoleotsuka@gmail.com> (raw)
In-Reply-To: <1515652995-15996-1-git-send-email-nicoleotsuka@gmail.com>

This patch cleans fsl_ssi_setup_regvals() by following changes:
1) Moving DBG bits to the first lines.
2) Setting SSIE, RE/TE as default and cleaning it for AC97

Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com>
Tested-by: Caleb Crome <caleb@crome.org>
---
 sound/soc/fsl/fsl_ssi.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index b449b8b..4399a22 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -575,18 +575,16 @@ static void fsl_ssi_setup_regvals(struct fsl_ssi *ssi)
 {
 	struct fsl_ssi_regvals *vals = ssi->regvals;
 
-	vals[RX].sier = SSI_SIER_RFF0_EN;
+	vals[RX].sier = SSI_SIER_RFF0_EN | FSLSSI_SIER_DBG_RX_FLAGS;
 	vals[RX].srcr = SSI_SRCR_RFEN0;
-	vals[RX].scr = 0;
-	vals[TX].sier = SSI_SIER_TFE0_EN;
+	vals[RX].scr = SSI_SCR_SSIEN | SSI_SCR_RE;
+	vals[TX].sier = SSI_SIER_TFE0_EN | FSLSSI_SIER_DBG_TX_FLAGS;
 	vals[TX].stcr = SSI_STCR_TFEN0;
-	vals[TX].scr = 0;
+	vals[TX].scr = SSI_SCR_SSIEN | SSI_SCR_TE;
 
 	/* AC97 has already enabled SSIEN, RE and TE, so ignore them */
-	if (!fsl_ssi_is_ac97(ssi)) {
-		vals[RX].scr = SSI_SCR_SSIEN | SSI_SCR_RE;
-		vals[TX].scr = SSI_SCR_SSIEN | SSI_SCR_TE;
-	}
+	if (fsl_ssi_is_ac97(ssi))
+		vals[RX].scr = vals[TX].scr = 0;
 
 	if (ssi->use_dma) {
 		vals[RX].sier |= SSI_SIER_RDMAE;
@@ -595,9 +593,6 @@ static void fsl_ssi_setup_regvals(struct fsl_ssi *ssi)
 		vals[RX].sier |= SSI_SIER_RIE;
 		vals[TX].sier |= SSI_SIER_TIE;
 	}
-
-	vals[RX].sier |= FSLSSI_SIER_DBG_RX_FLAGS;
-	vals[TX].sier |= FSLSSI_SIER_DBG_TX_FLAGS;
 }
 
 static void fsl_ssi_setup_ac97(struct fsl_ssi *ssi)
-- 
2.7.4

  parent reply	other threads:[~2018-01-11  6:46 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-11  6:42 [PATCH v2 00/16] ASoC: fsl_ssi: Clean up - program flow level Nicolin Chen
2018-01-11  6:42 ` Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 01/16] ASoC: fsl_ssi: Keep ssi->i2s_net updated Nicolin Chen
2018-01-11  6:43   ` Nicolin Chen
2018-02-22 13:17   ` Applied "ASoC: fsl_ssi: Keep ssi->i2s_net updated" to the asoc tree Mark Brown
2018-02-22 13:17     ` Mark Brown
2018-01-11  6:43 ` [PATCH v2 02/16] ASoC: fsl_ssi: Clean up set_dai_tdm_slot() Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 03/16] ASoC: fsl_ssi: Maintain a mask of active streams Nicolin Chen
2018-01-11  6:43   ` Nicolin Chen
2018-01-14 22:34   ` Maciej S. Szmigiero
2018-01-14 22:34     ` Maciej S. Szmigiero
2018-01-14 23:57     ` Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 04/16] ASoC: fsl_ssi: Rename fsl_ssi_disable_val macro Nicolin Chen
2018-01-11  6:43   ` Nicolin Chen
2018-01-14 22:34   ` Maciej S. Szmigiero
2018-01-14 22:34     ` Maciej S. Szmigiero
2018-01-15  0:03     ` Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 05/16] ASoC: fsl_ssi: Clear FIFO directly in fsl_ssi_config() Nicolin Chen
2018-01-11  6:43   ` Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 06/16] ASoC: fsl_ssi: Clean up helper functions of trigger() Nicolin Chen
2018-01-14 22:37   ` Maciej S. Szmigiero
2018-01-14 22:37     ` Maciej S. Szmigiero
2018-01-11  6:43 ` [PATCH v2 07/16] ASoC: fsl_ssi: Add DAIFMT define for AC97 Nicolin Chen
2018-01-11  6:43 ` Nicolin Chen [this message]
2018-01-11  6:43 ` [PATCH v2 09/16] ASoC: fsl_ssi: Set xFEN0 and xFEN1 together Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 10/16] ASoC: fsl_ssi: Use snd_soc_init_dma_data instead Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 11/16] ASoC: fsl_ssi: Move one-time configurations to probe() Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 12/16] ASoC: fsl_ssi: Setup AC97 in fsl_ssi_hw_init() Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 13/16] ASoC: fsl_ssi: Clean up _fsl_ssi_set_dai_fmt() Nicolin Chen
2018-01-14 22:40   ` Maciej S. Szmigiero
2018-01-14 22:40     ` Maciej S. Szmigiero
2018-01-15  0:11     ` Nicolin Chen
2018-01-15  0:11       ` Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 14/16] ASoC: fsl_ssi: Remove cpu_dai_drv from fsl_ssi structure Nicolin Chen
2018-01-14 22:42   ` Maciej S. Szmigiero
2018-01-14 22:42     ` Maciej S. Szmigiero
2018-01-15  0:13     ` Nicolin Chen
2018-01-15  0:13       ` Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 15/16] ASoC: fsl_ssi: Move DT related code to a separate probe() Nicolin Chen
2018-01-11  6:43 ` [PATCH v2 16/16] ASoC: fsl_ssi: Use ssi->streams instead of reading register Nicolin Chen
2018-02-22 13:16   ` Applied "ASoC: fsl_ssi: Use ssi->streams instead of reading register" to the asoc tree Mark Brown
2018-02-22 13:16     ` Mark Brown
2018-01-12 17:35 ` [PATCH v2 00/16] ASoC: fsl_ssi: Clean up - program flow level 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=1515652995-15996-9-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 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.