From cddd4591404fb4c53dc0b3c0b15b942cdbed4356 Mon Sep 17 00:00:00 2001 From: Yangbo Lu Date: Fri, 10 Apr 2020 10:47:05 +0800 Subject: layerscape: add patches-5.4 Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu --- ...-ASoC-fsl-sai-Just-one-device-can-playbac.patch | 51 ++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 target/linux/layerscape/patches-5.4/801-audio-0013-MLK-10611-1-ASoC-fsl-sai-Just-one-device-can-playbac.patch (limited to 'target/linux/layerscape/patches-5.4/801-audio-0013-MLK-10611-1-ASoC-fsl-sai-Just-one-device-can-playbac.patch') diff --git a/target/linux/layerscape/patches-5.4/801-audio-0013-MLK-10611-1-ASoC-fsl-sai-Just-one-device-can-playbac.patch b/target/linux/layerscape/patches-5.4/801-audio-0013-MLK-10611-1-ASoC-fsl-sai-Just-one-device-can-playbac.patch new file mode 100644 index 0000000000..faff9786b7 --- /dev/null +++ b/target/linux/layerscape/patches-5.4/801-audio-0013-MLK-10611-1-ASoC-fsl-sai-Just-one-device-can-playbac.patch @@ -0,0 +1,51 @@ +From 0ab3461b68ccc1d4ffb37dbc7f2e57adc8aed0fb Mon Sep 17 00:00:00 2001 +From: Zidan Wang +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 +(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 +@@ -605,6 +605,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); + +@@ -621,6 +626,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; -- cgit v1.2.3