aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-03-18 15:05:11 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-03-27 18:59:50 +0200
commita4212b77c0a48904218093645008f176e65e79bb (patch)
treeefcb3d5e26890e573396af9112a9b0dcadabf190 /target/linux/ipq806x
parent6b19d24254a1fe38e003a8dbf08d9d10099a56d1 (diff)
downloadupstream-a4212b77c0a48904218093645008f176e65e79bb.tar.gz
upstream-a4212b77c0a48904218093645008f176e65e79bb.tar.bz2
upstream-a4212b77c0a48904218093645008f176e65e79bb.zip
kernel: bump 5.10 to 5.10.175
Manually rebased: backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch All other patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 3ca98495897126113912f7ee4537f69459d21332)
Diffstat (limited to 'target/linux/ipq806x')
-rw-r--r--target/linux/ipq806x/patches-5.10/108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ipq806x/patches-5.10/108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch b/target/linux/ipq806x/patches-5.10/108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch
index 896dddc14b..2a3b6dd0a7 100644
--- a/target/linux/ipq806x/patches-5.10/108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch
+++ b/target/linux/ipq806x/patches-5.10/108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch
@@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -5047,6 +5047,10 @@ int stmmac_dvr_probe(struct device *devi
+@@ -5048,6 +5048,10 @@ int stmmac_dvr_probe(struct device *devi
reset_control_reset(priv->plat->stmmac_rst);
}
@@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Init MAC and get the capabilities */
ret = stmmac_hw_init(priv);
if (ret)
-@@ -5261,6 +5265,7 @@ int stmmac_dvr_remove(struct device *dev
+@@ -5262,6 +5266,7 @@ int stmmac_dvr_remove(struct device *dev
phylink_destroy(priv->phylink);
if (priv->plat->stmmac_rst)
reset_control_assert(priv->plat->stmmac_rst);