aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x/patches-5.10/108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-12-08 08:49:33 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2022-12-11 02:43:28 +0100
commit6801c460b6a72e324c6fc24bc5c14ff3afceb139 (patch)
tree0b9da089cb6c51d8c0e035866049c98d16a56c3a /target/linux/ipq806x/patches-5.10/108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch
parent7b7d8fe60de3fd5d45b7c817aef001cd85ee1533 (diff)
downloadupstream-6801c460b6a72e324c6fc24bc5c14ff3afceb139.tar.gz
upstream-6801c460b6a72e324c6fc24bc5c14ff3afceb139.tar.bz2
upstream-6801c460b6a72e324c6fc24bc5c14ff3afceb139.zip
kernel: bump 5.10 to 5.10.158
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/ipq806x/patches-5.10/108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch')
-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 324d42770d..64efbd74c5 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
-@@ -5033,6 +5033,10 @@ int stmmac_dvr_probe(struct device *devi
+@@ -5041,6 +5041,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)
-@@ -5247,6 +5251,7 @@ int stmmac_dvr_remove(struct device *dev
+@@ -5255,6 +5259,7 @@ int stmmac_dvr_remove(struct device *dev
phylink_destroy(priv->phylink);
if (priv->plat->stmmac_rst)
reset_control_assert(priv->plat->stmmac_rst);