52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From 0ab3461b68ccc1d4ffb37dbc7f2e57adc8aed0fb Mon Sep 17 00:00:00 2001
|
|
From: Zidan Wang <zidan.wang@freescale.com>
|
|
Date: Fri, 10 Apr 2015 09:52:36 +0800
|
|
Subject: [PATCH] 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 <zidan.wang@freescale.com>
|
|
(cherry picked from commit 7981a488c4da440db21f0544b519b44636a0cabb)
|
|
---
|
|
sound/soc/fsl/fsl_sai.c | 10 ++++++++++
|
|
sound/soc/fsl/fsl_sai.h | 1 +
|
|
2 files changed, 11 insertions(+)
|
|
|
|
--- a/sound/soc/fsl/fsl_sai.c
|
|
+++ b/sound/soc/fsl/fsl_sai.c
|
|
@@ -606,6 +606,11 @@ static int fsl_sai_startup(struct snd_pc
|
|
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);
|
|
|
|
@@ -622,6 +627,11 @@ static void fsl_sai_shutdown(struct snd_
|
|
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 = {
|
|
--- 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;
|