mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +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>
43 lines
1.2 KiB
Diff
43 lines
1.2 KiB
Diff
From 0e4fe4adfd9a9cd36220b79a8eecce4d24a9fd02 Mon Sep 17 00:00:00 2001
|
|
From: Dong Aisheng <aisheng.dong@nxp.com>
|
|
Date: Tue, 7 May 2019 11:01:08 +0800
|
|
Subject: [PATCH] ASoC: fsl: sai: fix build failture due to 5.1 RC7 upgrade
|
|
|
|
Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
|
|
---
|
|
sound/soc/fsl/fsl_sai.c | 10 ----------
|
|
1 file changed, 10 deletions(-)
|
|
|
|
--- a/sound/soc/fsl/fsl_sai.c
|
|
+++ b/sound/soc/fsl/fsl_sai.c
|
|
@@ -418,14 +418,12 @@ static int fsl_sai_set_dai_fmt_tr(struct
|
|
case SND_SOC_DAIFMT_CBS_CFS:
|
|
val_cr2 |= FSL_SAI_CR2_BCD_MSTR;
|
|
val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
|
|
- sai->is_slave_mode = false;
|
|
break;
|
|
case SND_SOC_DAIFMT_CBM_CFM:
|
|
sai->slave_mode[tx] = true;
|
|
break;
|
|
case SND_SOC_DAIFMT_CBS_CFM:
|
|
val_cr2 |= FSL_SAI_CR2_BCD_MSTR;
|
|
- sai->is_slave_mode = false;
|
|
break;
|
|
case SND_SOC_DAIFMT_CBM_CFS:
|
|
val_cr4 |= FSL_SAI_CR4_FSD_MSTR;
|
|
@@ -1575,14 +1573,6 @@ static int fsl_sai_remove(struct platfor
|
|
return 0;
|
|
}
|
|
|
|
-static const struct of_device_id fsl_sai_ids[] = {
|
|
- { .compatible = "fsl,vf610-sai", },
|
|
- { .compatible = "fsl,imx6sx-sai", },
|
|
- { .compatible = "fsl,imx6ul-sai", },
|
|
- { /* sentinel */ }
|
|
-};
|
|
-MODULE_DEVICE_TABLE(of, fsl_sai_ids);
|
|
-
|
|
#ifdef CONFIG_PM
|
|
static int fsl_sai_runtime_suspend(struct device *dev)
|
|
{
|