kernel: bump 5.4 to 5.4.109
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 801-audio-0013-MLK-10611-1-ASoC-fsl-sai-Just-one-device-can-playbac.patch
1 From 0ab3461b68ccc1d4ffb37dbc7f2e57adc8aed0fb Mon Sep 17 00:00:00 2001
2 From: Zidan Wang <zidan.wang@freescale.com>
3 Date: Fri, 10 Apr 2015 09:52:36 +0800
4 Subject: [PATCH] MLK-10611-1 ASoC: fsl-sai: Just one device can
5 playback(captrue) when using the same SAI
6
7 Just one device can playback(captrue) when using the same SAI.
8
9 Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
10 (cherry picked from commit 7981a488c4da440db21f0544b519b44636a0cabb)
11 ---
12 sound/soc/fsl/fsl_sai.c | 10 ++++++++++
13 sound/soc/fsl/fsl_sai.h | 1 +
14 2 files changed, 11 insertions(+)
15
16 --- a/sound/soc/fsl/fsl_sai.c
17 +++ b/sound/soc/fsl/fsl_sai.c
18 @@ -605,6 +605,11 @@ static int fsl_sai_startup(struct snd_pc
19 bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
20 int ret;
21
22 + if (sai->is_stream_opened[tx])
23 + return -EBUSY;
24 + else
25 + sai->is_stream_opened[tx] = true;
26 +
27 regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE,
28 FSL_SAI_CR3_TRCE);
29
30 @@ -621,6 +626,11 @@ static void fsl_sai_shutdown(struct snd_
31 bool tx = substream->stream == SNDRV_PCM_STREAM_PLAYBACK;
32
33 regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0);
34 +
35 + if (sai->is_stream_opened[tx]) {
36 + regmap_update_bits(sai->regmap, FSL_SAI_xCR3(tx), FSL_SAI_CR3_TRCE, 0);
37 + sai->is_stream_opened[tx] = false;
38 + }
39 }
40
41 static const struct snd_soc_dai_ops fsl_sai_pcm_dai_ops = {
42 --- a/sound/soc/fsl/fsl_sai.h
43 +++ b/sound/soc/fsl/fsl_sai.h
44 @@ -137,6 +137,7 @@ struct fsl_sai {
45 bool is_dsp_mode;
46 bool sai_on_imx;
47 bool synchronous[2];
48 + bool is_stream_opened[2];
49
50 unsigned int mclk_id[2];
51 unsigned int mclk_streams;