From 90248ae9541516436d4eaa7618753b32b1fa988e Mon Sep 17 00:00:00 2001 From: Zidan Wang Date: Fri, 10 Apr 2015 09:52:36 +0800 Subject: MLK-10611-1 ASoC: fsl-sai: Just one device can playback(captrue) when using the same SAI Just one device can playback(captrue) when using the same SAI. Signed-off-by: Zidan Wang (cherry picked from commit 7981a488c4da440db21f0544b519b44636a0cabb) --- sound/soc/fsl/fsl_sai.c | 10 ++++++++++ sound/soc/fsl/fsl_sai.h | 1 + 2 files changed, 11 insertions(+) (limited to 'sound/soc/fsl') diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index b62c454e01cf..7a8e0d29ecb0 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -605,6 +605,11 @@ static int fsl_sai_startup(struct snd_pcm_substream *substream, bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; int ret; + if (sai->is_stream_opened[tx]) + return -EBUSY; + else + sai->is_stream_opened[tx] = true; + regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, FSL_SAI_CR3_TRCE); @@ -621,6 +626,11 @@ static void fsl_sai_shutdown(struct snd_pcm_substream *substream, bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK; regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0); + + if (sai->is_stream_opened[tx]) { + regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0); + sai->is_stream_opened[tx] = false; + } } static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = { diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 24cb156bf995..80ccbaac038f 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -137,6 +137,7 @@ struct fsl_sai { bool is_dsp_mode; bool sai_on_imx; bool synchronous[2]; + bool is_stream_opened[2]; unsigned int mclk_id[2]; unsigned int mclk_streams; -- cgit v1.2.3