diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-03 16:46:35 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-07-03 19:58:31 +0200 |
| commit | be0639063a701254677bb982d8e28a71a931433f (patch) | |
| tree | 47c329b76b07a78779817ee0cfd52cfcbc9a57f1 /target/linux/mediatek | |
| parent | 60e88fde77ea413fc2fb367cdcc47d5282d391e3 (diff) | |
| download | upstream-be0639063a701254677bb982d8e28a71a931433f.tar.gz upstream-be0639063a701254677bb982d8e28a71a931433f.tar.bz2 upstream-be0639063a701254677bb982d8e28a71a931433f.zip | |
kernel: bump 5.4 to 5.4.203
Merged upstream:
bcm27xx/patches-5.4/950-1014-Revert-mailbox-avoid-timer-start-from-callback.patch
generic/backport-5.4/080-wireguard-0021-crypto-blake2s-generic-C-library-implementation-and-.patch
Manually adapted:
layerscape/patches-5.4/801-audio-0005-Revert-ASoC-fsl_sai-Add-support-for-SAI-new-version.patch
oxnas/patches-5.4/100-oxnas-clk-plla-pllb.patch
Compile-tested: lantiq/xrx200
Run-tested: lantiq/xrx200
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mediatek')
| -rw-r--r-- | target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch | 2 | ||||
| -rw-r--r-- | target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch index 420feac253..64b556088d 100644 --- a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2610,6 +2610,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2612,6 +2612,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch b/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch index e75d76b9cc..a60a607d8b 100644 --- a/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch +++ b/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch @@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> #include <linux/mfd/syscon.h> #include <linux/regmap.h> #include <linux/clk.h> -@@ -2506,6 +2507,13 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -2526,6 +2527,13 @@ static int mtk_hw_init(struct mtk_eth *e if (ret) goto err_disable_pm; @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) { ret = device_reset(eth->dev); if (ret) { -@@ -3104,6 +3112,16 @@ static int mtk_probe(struct platform_dev +@@ -3124,6 +3132,16 @@ static int mtk_probe(struct platform_dev } } |