aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-07-29 12:25:26 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-29 23:03:41 +0200
commit7be62b1187bb7e21bcdaadfc3d47713a91f05898 (patch)
tree2d78088345f99ff7a3ceb77671885fa14d0e3a5d /target/linux/ipq806x
parent56760c0b1316a0e379ff141b895c2929f0dace8d (diff)
downloadupstream-7be62b1187bb7e21bcdaadfc3d47713a91f05898.tar.gz
upstream-7be62b1187bb7e21bcdaadfc3d47713a91f05898.tar.bz2
upstream-7be62b1187bb7e21bcdaadfc3d47713a91f05898.zip
kernel: bump 5.10 to 5.10.134
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
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 77667b139e..84f5f95841 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
-@@ -5021,6 +5021,10 @@ int stmmac_dvr_probe(struct device *devi
+@@ -5020,6 +5020,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)
-@@ -5245,6 +5249,7 @@ int stmmac_dvr_remove(struct device *dev
+@@ -5244,6 +5248,7 @@ int stmmac_dvr_remove(struct device *dev
phylink_destroy(priv->phylink);
if (priv->plat->stmmac_rst)
reset_control_assert(priv->plat->stmmac_rst);