diff options
author | Nicolin Chen <nicoleotsuka@gmail.com> | 2018-02-12 17:03:25 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-02-21 07:31:00 -0500 |
commit | 9c4f509a53cbcd968677c7f15c07260dd6c2276c (patch) | |
tree | f16c1f6ba714e00b62a8b233a2b4c63e1a1c5e68 | |
parent | 76f3845110d7d40eb60c12bc64cdfe431a985947 (diff) |
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 <nicoleotsuka@gmail.com>
Tested-by: Caleb Crome <caleb@crome.org>
Tested-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 7 |
1 files changed, 1 insertions, 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 *substream, | |||
803 | unsigned int sample_size = params_width(hw_params); | 803 | unsigned int sample_size = params_width(hw_params); |
804 | u32 wl = SSI_SxCCR_WL(sample_size); | 804 | u32 wl = SSI_SxCCR_WL(sample_size); |
805 | int ret; | 805 | int ret; |
806 | u32 scr; | ||
807 | int enabled; | ||
808 | |||
809 | regmap_read(regs, REG_SSI_SCR, &scr); | ||
810 | enabled = scr & SSI_SCR_SSIEN; | ||
811 | 806 | ||
812 | /* | 807 | /* |
813 | * SSI is properly configured if it is enabled and running in | 808 | * 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 *substream, | |||
815 | * that should set separate configurations for STCCR and SRCCR | 810 | * that should set separate configurations for STCCR and SRCCR |
816 | * despite running in the synchronous mode. | 811 | * despite running in the synchronous mode. |
817 | */ | 812 | */ |
818 | if (enabled && ssi->synchronous) | 813 | if (ssi->streams && ssi->synchronous) |
819 | return 0; | 814 | return 0; |
820 | 815 | ||
821 | if (fsl_ssi_is_i2s_master(ssi)) { | 816 | if (fsl_ssi_is_i2s_master(ssi)) { |