mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +00:00
b4c02c9998
Removed upstreamed patches:
generic/pending-5.4
445-mtd-spinand-gigadevice-Only-one-dummy-byte-in-QUA.patch
446-mtd-spinand-gigadevice-Add-QE-Bit.patch
pistachio/patches-5.4
150-pwm-img-Fix-null-pointer-access-in-probe.patch
Manually rebased:
layerscape/patches-5.4
801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch
801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch
801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch
820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
mvebu (mamba, rango), x86_64, ramips/mt7621
Run-tested: ipq806x/R7800, mvebu (mamba, rango), x86_64, ramips (RT-AC57U)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[alter 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
77 lines
2.0 KiB
Diff
77 lines
2.0 KiB
Diff
From cf07127ea019b78f7ea5e009d494e2bd0bd475fa Mon Sep 17 00:00:00 2001
|
|
From: Leonard Crestez <leonard.crestez@nxp.com>
|
|
Date: Thu, 3 Oct 2019 20:44:56 +0300
|
|
Subject: [PATCH] Revert "ASoC: fsl_sai: Fix noise when using EDMA"
|
|
|
|
This reverts commit e75f4940e8ad0dd76527302a10c06b58bf7eb590.
|
|
---
|
|
sound/soc/fsl/fsl_sai.c | 15 ---------------
|
|
sound/soc/fsl/fsl_sai.h | 1 -
|
|
2 files changed, 16 deletions(-)
|
|
|
|
--- a/sound/soc/fsl/fsl_sai.c
|
|
+++ b/sound/soc/fsl/fsl_sai.c
|
|
@@ -628,16 +628,6 @@ static int fsl_sai_startup(struct snd_pc
|
|
FSL_SAI_CR3_TRCE_MASK,
|
|
FSL_SAI_CR3_TRCE);
|
|
|
|
- /*
|
|
- * EDMA controller needs period size to be a multiple of
|
|
- * tx/rx maxburst
|
|
- */
|
|
- if (sai->soc_data->use_edma)
|
|
- 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);
|
|
|
|
@@ -1052,35 +1042,30 @@ static int fsl_sai_remove(struct platfor
|
|
|
|
static const struct fsl_sai_soc_data fsl_sai_vf610_data = {
|
|
.use_imx_pcm = false,
|
|
- .use_edma = false,
|
|
.fifo_depth = 32,
|
|
.reg_offset = 0,
|
|
};
|
|
|
|
static const struct fsl_sai_soc_data fsl_sai_imx6sx_data = {
|
|
.use_imx_pcm = true,
|
|
- .use_edma = false,
|
|
.fifo_depth = 32,
|
|
.reg_offset = 0,
|
|
};
|
|
|
|
static const struct fsl_sai_soc_data fsl_sai_imx7ulp_data = {
|
|
.use_imx_pcm = true,
|
|
- .use_edma = false,
|
|
.fifo_depth = 16,
|
|
.reg_offset = 8,
|
|
};
|
|
|
|
static const struct fsl_sai_soc_data fsl_sai_imx8mq_data = {
|
|
.use_imx_pcm = true,
|
|
- .use_edma = false,
|
|
.fifo_depth = 128,
|
|
.reg_offset = 8,
|
|
};
|
|
|
|
static const struct fsl_sai_soc_data fsl_sai_imx8qm_data = {
|
|
.use_imx_pcm = true,
|
|
- .use_edma = true,
|
|
.fifo_depth = 64,
|
|
.reg_offset = 0,
|
|
};
|
|
--- a/sound/soc/fsl/fsl_sai.h
|
|
+++ b/sound/soc/fsl/fsl_sai.h
|
|
@@ -157,7 +157,6 @@
|
|
|
|
struct fsl_sai_soc_data {
|
|
bool use_imx_pcm;
|
|
- bool use_edma;
|
|
unsigned int fifo_depth;
|
|
unsigned int reg_offset;
|
|
};
|