mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 15:56:49 +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>
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From a115bf34468398647e7a8f380058bd597e44e1b3 Mon Sep 17 00:00:00 2001
|
|
From: Viorel Suman <viorel.suman@nxp.com>
|
|
Date: Mon, 29 Jan 2018 16:04:44 +0200
|
|
Subject: [PATCH] MLK-16224-6: ASoC: fsl_sai: fix DSD suspend/resume
|
|
|
|
With the existing implementation the SAI pinctrl state is restored to
|
|
default after resume - this breaks DSD playback after resume.
|
|
Restore DSD pinctrl state in snd_soc_dai_driver resume callback.
|
|
|
|
Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
|
|
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
|
|
---
|
|
sound/soc/fsl/fsl_sai.c | 18 ++++++++++++++++++
|
|
1 file changed, 18 insertions(+)
|
|
|
|
--- a/sound/soc/fsl/fsl_sai.c
|
|
+++ b/sound/soc/fsl/fsl_sai.c
|
|
@@ -893,6 +893,23 @@ static int fsl_sai_dai_probe(struct snd_
|
|
return 0;
|
|
}
|
|
|
|
+static int fsl_sai_dai_resume(struct snd_soc_dai *cpu_dai)
|
|
+{
|
|
+ struct fsl_sai *sai = snd_soc_dai_get_drvdata(cpu_dai);
|
|
+ int ret;
|
|
+
|
|
+ if (sai->is_dsd && !IS_ERR_OR_NULL(sai->pins_dsd)) {
|
|
+ ret = pinctrl_select_state(sai->pinctrl, sai->pins_dsd);
|
|
+ if (ret) {
|
|
+ dev_err(cpu_dai->dev,
|
|
+ "failed to set proper pins state: %d\n", ret);
|
|
+ return ret;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static struct snd_soc_dai_driver fsl_sai_dai_template = {
|
|
.probe = fsl_sai_dai_probe,
|
|
.playback = {
|
|
@@ -913,6 +930,7 @@ static struct snd_soc_dai_driver fsl_sai
|
|
.rates = SNDRV_PCM_RATE_KNOT,
|
|
.formats = FSL_SAI_FORMATS,
|
|
},
|
|
+ .resume = fsl_sai_dai_resume,
|
|
.ops = &fsl_sai_pcm_dai_ops,
|
|
};
|
|
|