From da77b9c2f185db72a2917aa2e18f0c8bb164d3c4 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Thu, 3 Jun 2021 11:12:02 +0100 Subject: kernel: bump 5.10 to 5.10.42 Deleted (reverse-appliable): generic/pending-5.10/110-perf-jevents-fix-getting-maximum-number-of-fds.patch Manually refreshed: ramips/patches-5.10/835-asoc-add-mt7620-support.patch Signed-off-by: Rui Salvaterra --- target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch | 2 +- .../700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/mediatek') diff --git a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch index 2e474dd5fe..8dc680d180 100644 --- a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2687,6 +2687,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2699,6 +2699,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.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch b/target/linux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch index 0b028cdcee..e131bfdf17 100644 --- a/target/linux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch +++ b/target/linux/mediatek/patches-5.10/700-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch @@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau #include #include #include -@@ -2473,6 +2474,13 @@ static int mtk_hw_init(struct mtk_eth *e +@@ -2494,6 +2495,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 if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) { ret = device_reset(eth->dev); if (ret) { -@@ -3053,6 +3061,16 @@ static int mtk_probe(struct platform_dev +@@ -3074,6 +3082,16 @@ static int mtk_probe(struct platform_dev } } @@ -70,7 +70,7 @@ Signed-off-by: Felix Fietkau GFP_KERNEL); --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h -@@ -437,6 +437,12 @@ +@@ -450,6 +450,12 @@ #define RSTCTRL_FE BIT(6) #define RSTCTRL_PPE BIT(31) -- cgit v1.2.3