The patch

   ASoC: fsl_ssi: Use ssi->streams instead of reading register

has been applied to the asoc tree at 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.


>From 9c4f509a53cbcd968677c7f15c07260dd6c2276c Mon Sep 17 00:00:00 2001
From: Nicolin Chen <>
Date: Mon, 12 Feb 2018 14:03:25 -0800
Subject: [PATCH] ASoC: fsl_ssi: Use ssi->streams instead of reading register

Since ssi->streams is being updated along with SCR register and
its SSIEN bit, it's simpler to use it instead.

Signed-off-by: Nicolin Chen <>
Tested-by: Caleb Crome <>
Tested-by: Maciej S. Szmigiero <>
Reviewed-by: Maciej S. Szmigiero <>
Signed-off-by: Mark Brown <>
 sound/soc/fsl/fsl_ssi.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 5bc67ad8000f..0823b08923b5 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -803,11 +803,6 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream 
        unsigned int sample_size = params_width(hw_params);
        u32 wl = SSI_SxCCR_WL(sample_size);
        int ret;
-       u32 scr;
-       int enabled;
-       regmap_read(regs, REG_SSI_SCR, &scr);
-       enabled = scr & SSI_SCR_SSIEN;
         * SSI is properly configured if it is enabled and running in
@@ -815,7 +810,7 @@ static int fsl_ssi_hw_params(struct snd_pcm_substream 
         * that should set separate configurations for STCCR and SRCCR
         * despite running in the synchronous mode.
-       if (enabled && ssi->synchronous)
+       if (ssi->streams && ssi->synchronous)
                return 0;
        if (fsl_ssi_is_i2s_master(ssi)) {

Reply via email to