aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.14
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-06-05 01:06:28 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-06 17:57:39 +0200
commitccc505502e93f6f3b0e7a7288f15dd7a03e85f5b (patch)
treee3f91606873495ec492602ef6ec636243391654e /target/linux/mediatek/patches-4.14
parent1153773c78d39d518b592f7b77180f370bcd4a60 (diff)
downloadupstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.tar.gz
upstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.tar.bz2
upstream-ccc505502e93f6f3b0e7a7288f15dd7a03e85f5b.zip
kernel: bump 4.14 to 4.14.235
Manually rebased ramips/patches-5.4/0048-asoc-add-mt7620-support.patch All others updated automatically. Compile-tested on: ath79/generic, ramips/mt7621 Runtime-tested on: ath79/generic Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mediatek/patches-4.14')
-rw-r--r--target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch2
-rw-r--r--target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch b/target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch
index 8163e4475d..5d806f307e 100644
--- a/target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch
+++ b/target/linux/mediatek/patches-4.14/0042-net-next-mediatek-honour-special-tag-bit-inside-RX-D.patch
@@ -40,7 +40,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
!eth->netdev[mac]))
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -287,6 +287,7 @@
+@@ -288,6 +288,7 @@
/* QDMA descriptor rxd4 */
#define RX_DMA_L4_VALID BIT(24)
diff --git a/target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch b/target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch
index 37c03fed88..1c041cd71d 100644
--- a/target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch
+++ b/target/linux/mediatek/patches-4.14/0175-net-mediatek-remove-superfluous-pin-setup-for-MT7622.patch
@@ -86,7 +86,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
const struct of_device_id of_mtk_match[] = {
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -574,10 +574,13 @@ struct mtk_rx_ring {
+@@ -575,10 +575,13 @@ struct mtk_rx_ring {
* @caps Flags shown the extra capability for the SoC
* @required_clks Flags shown the bitmap for required clocks on
* the target SoC