diff options
author | Yangbo Lu <yangbo.lu@nxp.com> | 2020-04-10 10:47:05 +0800 |
---|---|---|
committer | Petr Štetiar <ynezz@true.cz> | 2020-05-07 12:53:06 +0200 |
commit | cddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch) | |
tree | 392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/801-audio-0028-MLK-15927-1-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch | |
parent | d1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff) | |
download | upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2 upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip |
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 <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0028-MLK-15927-1-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/801-audio-0028-MLK-15927-1-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0028-MLK-15927-1-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch b/target/linux/layerscape/patches-5.4/801-audio-0028-MLK-15927-1-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch new file mode 100644 index 0000000000..71554d295a --- /dev/null +++ b/target/linux/layerscape/patches-5.4/801-audio-0028-MLK-15927-1-ASoC-fsl_sai-Fix-noise-when-using-EDMA.patch @@ -0,0 +1,107 @@ +From 3b671c297cff1ba5f5c3e089ffa82523eca3c598 Mon Sep 17 00:00:00 2001 +From: Mihai Serban <mihai.serban@nxp.com> +Date: Fri, 7 Jul 2017 15:09:51 +0300 +Subject: [PATCH] MLK-15927-1: ASoC: fsl_sai: Fix noise when using EDMA + +EDMA requires the period size to be multiple of maxburst. Otherwise the +remaining bytes are not transferred and thus noise is produced. + +We can handle this issue by adding a constraint on +SNDRV_PCM_HW_PARAM_PERIOD_SIZE to be multiple of tx/rx maxburst value. + +This is based on a similar patch we have for ESAI: +commit bd3f3eb2a37c +("MLK-15109-2: ASoC: fsl_esai: add constrain_period_size") + +Signed-off-by: Mihai Serban <mihai.serban@nxp.com> +Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com> +--- + sound/soc/fsl/fsl_sai.c | 23 +++++++++++++++++++++++ + sound/soc/fsl/fsl_sai.h | 2 ++ + 2 files changed, 25 insertions(+) + +--- a/sound/soc/fsl/fsl_sai.c ++++ b/sound/soc/fsl/fsl_sai.c +@@ -35,6 +35,7 @@ static struct fsl_sai_soc_data fsl_sai_v + .fifos = 1, + .fifo_depth = 32, + .flags = 0, ++ .constrain_period_size = false, + }; + + static struct fsl_sai_soc_data fsl_sai_imx6sx = { +@@ -44,6 +45,7 @@ static struct fsl_sai_soc_data fsl_sai_i + .fifo_depth = 32, + .flags = 0, + .reg_offset = 0, ++ .constrain_period_size = false, + }; + + static struct fsl_sai_soc_data fsl_sai_imx6ul = { +@@ -53,6 +55,7 @@ static struct fsl_sai_soc_data fsl_sai_i + .fifo_depth = 32, + .flags = 0, + .reg_offset = 0, ++ .constrain_period_size = false, + }; + + static struct fsl_sai_soc_data fsl_sai_imx7ulp = { +@@ -62,6 +65,7 @@ static struct fsl_sai_soc_data fsl_sai_i + .fifo_depth = 16, + .flags = SAI_FLAG_PMQOS, + .reg_offset = 0, ++ .constrain_period_size = false, + }; + + static struct fsl_sai_soc_data fsl_sai_imx8mq = { +@@ -71,6 +75,17 @@ static struct fsl_sai_soc_data fsl_sai_i + .fifo_depth = 32, + .flags = 0, + .reg_offset = 8, ++ .constrain_period_size = false, ++}; ++ ++static struct fsl_sai_soc_data fsl_sai_imx8qm = { ++ .imx = true, ++ .dataline = 0x3, ++ .fifos = 1, ++ .fifo_depth = 32, ++ .flags = 0, ++ .reg_offset = 0, ++ .constrain_period_size = true, + }; + + static const unsigned int fsl_sai_rates[] = { +@@ -692,6 +707,13 @@ static int fsl_sai_startup(struct snd_pc + FSL_SAI_CR3_TRCE_MASK, + FSL_SAI_CR3_TRCE(sai->dataline[tx])); + ++ /* EDMA engine needs periods of size multiple of tx/rx maxburst */ ++ if (sai->soc->constrain_period_size) ++ snd_pcm_hw_constraint_step(substream->runtime, 0, ++ SNDRV_PCM_HW_PARAM_PERIOD_SIZE, ++ tx ? sai->dma_params_tx.maxburst : ++ sai->dma_params_rx.maxburst); ++ + ret = snd_pcm_hw_constraint_list(substream->runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, &fsl_sai_rate_constraints); + +@@ -914,6 +936,7 @@ static const struct of_device_id fsl_sai + { .compatible = "fsl,imx6ul-sai", .data = &fsl_sai_imx6ul }, + { .compatible = "fsl,imx7ulp-sai", .data = &fsl_sai_imx7ulp }, + { .compatible = "fsl,imx8mq-sai", .data = &fsl_sai_imx8mq }, ++ { .compatible = "fsl,imx8qm-sai", .data = &fsl_sai_imx8qm }, + { /* sentinel */ } + }; + MODULE_DEVICE_TABLE(of, fsl_sai_ids); +--- a/sound/soc/fsl/fsl_sai.h ++++ b/sound/soc/fsl/fsl_sai.h +@@ -147,6 +147,8 @@ struct fsl_sai_soc_data { + unsigned int flags; + unsigned char reg_offset; + bool imx; ++ /* True for EDMA because it needs period size multiple of maxburst */ ++ bool constrain_period_size; + }; + + struct fsl_sai { |