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 v5 03/17] ASoC: fsl_ssi: Clean up set_dai_tdm_slot() Date: Tue, 16 Jan 2018 22:51:28 -0800 [thread overview] Message-ID: <1516171902-32669-4-git-send-email-nicoleotsuka@gmail.com> (raw) In-Reply-To: <1516171902-32669-1-git-send-email-nicoleotsuka@gmail.com> This patch replaces the register read with ssi->i2s_net for simplification. It also removes masking SSIEN from scr value since it's handled later by regmap_update_bits() to set this scr value back. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> Tested-by: Caleb Crome <caleb@crome.org> --- sound/soc/fsl/fsl_ssi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 9847a1d..8984ee2 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1055,9 +1055,7 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, } /* The slot number should be >= 2 if using Network mode or I2S mode */ - regmap_read(regs, REG_SSI_SCR, &val); - val &= SSI_SCR_I2S_MODE_MASK | SSI_SCR_NET; - if (val && slots < 2) { + if (ssi->i2s_net && slots < 2) { dev_err(dai->dev, "slot number should be >= 2 in I2S or NET\n"); return -EINVAL; } @@ -1067,9 +1065,8 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, regmap_update_bits(regs, REG_SSI_SRCCR, SSI_SxCCR_DC_MASK, SSI_SxCCR_DC(slots)); - /* Save SSIEN bit of the SCR register */ + /* Save the SCR register value */ regmap_read(regs, REG_SSI_SCR, &val); - val &= SSI_SCR_SSIEN; /* Temporarily enable SSI to allow SxMSKs to be configurable */ regmap_update_bits(regs, REG_SSI_SCR, SSI_SCR_SSIEN, SSI_SCR_SSIEN); -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Nicolin Chen <nicoleotsuka@gmail.com> To: timur@tabi.org, broonie@kernel.org, mail@maciej.szmigiero.name Cc: alsa-devel@alsa-project.org, kernel@pengutronix.de, linux-kernel@vger.kernel.org, caleb@crome.org, lgirdwood@gmail.com, arnaud.mouiche@invoxia.com, lukma@denx.de, fabio.estevam@nxp.com, linuxppc-dev@lists.ozlabs.org Subject: [PATCH v5 03/17] ASoC: fsl_ssi: Clean up set_dai_tdm_slot() Date: Tue, 16 Jan 2018 22:51:28 -0800 [thread overview] Message-ID: <1516171902-32669-4-git-send-email-nicoleotsuka@gmail.com> (raw) In-Reply-To: <1516171902-32669-1-git-send-email-nicoleotsuka@gmail.com> This patch replaces the register read with ssi->i2s_net for simplification. It also removes masking SSIEN from scr value since it's handled later by regmap_update_bits() to set this scr value back. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> Tested-by: Caleb Crome <caleb@crome.org> --- sound/soc/fsl/fsl_ssi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 9847a1d..8984ee2 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1055,9 +1055,7 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, } /* The slot number should be >= 2 if using Network mode or I2S mode */ - regmap_read(regs, REG_SSI_SCR, &val); - val &= SSI_SCR_I2S_MODE_MASK | SSI_SCR_NET; - if (val && slots < 2) { + if (ssi->i2s_net && slots < 2) { dev_err(dai->dev, "slot number should be >= 2 in I2S or NET\n"); return -EINVAL; } @@ -1067,9 +1065,8 @@ static int fsl_ssi_set_dai_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, regmap_update_bits(regs, REG_SSI_SRCCR, SSI_SxCCR_DC_MASK, SSI_SxCCR_DC(slots)); - /* Save SSIEN bit of the SCR register */ + /* Save the SCR register value */ regmap_read(regs, REG_SSI_SCR, &val); - val &= SSI_SCR_SSIEN; /* Temporarily enable SSI to allow SxMSKs to be configurable */ regmap_update_bits(regs, REG_SSI_SCR, SSI_SCR_SSIEN, SSI_SCR_SSIEN); -- 2.7.4
next prev parent reply other threads:[~2018-01-17 6:52 UTC|newest] Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-17 6:51 [PATCH v5 00/17] ASoC: fsl_ssi: Clean up - program flow level Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 01/17] ASoC: fsl_ssi: Redefine RX and TX macros Nicolin Chen 2018-01-17 6:51 ` Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 02/17] ASoC: fsl_ssi: Keep ssi->i2s_net updated Nicolin Chen 2018-01-17 6:51 ` Nicolin Chen [this message] 2018-01-17 6:51 ` [PATCH v5 03/17] ASoC: fsl_ssi: Clean up set_dai_tdm_slot() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 04/17] ASoC: fsl_ssi: Maintain a mask of active streams Nicolin Chen 2018-01-17 6:51 ` Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 05/17] ASoC: fsl_ssi: Rename fsl_ssi_disable_val macro Nicolin Chen 2018-01-17 6:51 ` Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 06/17] ASoC: fsl_ssi: Clear FIFO directly in fsl_ssi_config() Nicolin Chen 2018-01-17 6:51 ` Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 07/17] ASoC: fsl_ssi: Clean up helper functions of trigger() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 08/17] ASoC: fsl_ssi: Add DAIFMT define for AC97 Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 09/17] ASoC: fsl_ssi: Clean up fsl_ssi_setup_regvals() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 10/17] ASoC: fsl_ssi: Set xFEN0 and xFEN1 together Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 11/17] ASoC: fsl_ssi: Use snd_soc_init_dma_data instead Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 12/17] ASoC: fsl_ssi: Move one-time configurations to probe() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 13/17] ASoC: fsl_ssi: Setup AC97 in fsl_ssi_hw_init() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 14/17] ASoC: fsl_ssi: Clean up _fsl_ssi_set_dai_fmt() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 15/17] ASoC: fsl_ssi: Add bool synchronous to mark synchronous mode Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 16/17] ASoC: fsl_ssi: Move DT related code to a separate probe() Nicolin Chen 2018-01-17 6:51 ` [PATCH v5 17/17] ASoC: fsl_ssi: Use ssi->streams instead of reading register Nicolin Chen 2018-01-17 15:19 ` [PATCH v5 00/17] ASoC: fsl_ssi: Clean up - program flow level Caleb Crome 2018-01-17 15:19 ` Caleb Crome 2018-01-17 19:38 ` Maciej S. Szmigiero 2018-01-17 19:38 ` Maciej S. Szmigiero 2018-01-17 20:02 ` Nicolin Chen 2018-01-17 20:02 ` Nicolin Chen 2018-01-17 20:27 ` Maciej S. Szmigiero 2018-01-17 20:27 ` Maciej S. Szmigiero
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=1516171902-32669-4-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: linkBe 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.