mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-19 22:18:16 +02: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>
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From 6357cf1832f46d29f9756a34887af7fd96d48f18 Mon Sep 17 00:00:00 2001
|
|
From: Dong Aisheng <aisheng.dong@nxp.com>
|
|
Date: Fri, 16 Aug 2019 18:01:12 +0800
|
|
Subject: [PATCH] Revert "ASoC: fsl_sai: Add support for imx7ulp/imx8mq"
|
|
|
|
This reverts commit a860fac420971c5a90d4f78959b44ead793aee4f.
|
|
---
|
|
sound/soc/fsl/fsl_sai.c | 14 --------------
|
|
1 file changed, 14 deletions(-)
|
|
|
|
--- a/sound/soc/fsl/fsl_sai.c
|
|
+++ b/sound/soc/fsl/fsl_sai.c
|
|
@@ -1035,24 +1035,10 @@ static const struct fsl_sai_soc_data fsl
|
|
.reg_offset = 0,
|
|
};
|
|
|
|
-static const struct fsl_sai_soc_data fsl_sai_imx7ulp_data = {
|
|
- .use_imx_pcm = true,
|
|
- .fifo_depth = 16,
|
|
- .reg_offset = 8,
|
|
-};
|
|
-
|
|
-static const struct fsl_sai_soc_data fsl_sai_imx8mq_data = {
|
|
- .use_imx_pcm = true,
|
|
- .fifo_depth = 128,
|
|
- .reg_offset = 8,
|
|
-};
|
|
-
|
|
static const struct of_device_id fsl_sai_ids[] = {
|
|
{ .compatible = "fsl,vf610-sai", .data = &fsl_sai_vf610_data },
|
|
{ .compatible = "fsl,imx6sx-sai", .data = &fsl_sai_imx6sx_data },
|
|
{ .compatible = "fsl,imx6ul-sai", .data = &fsl_sai_imx6sx_data },
|
|
- { .compatible = "fsl,imx7ulp-sai", .data = &fsl_sai_imx7ulp_data },
|
|
- { .compatible = "fsl,imx8mq-sai", .data = &fsl_sai_imx8mq_data },
|
|
{ /* sentinel */ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, fsl_sai_ids);
|