kernel: bump 5.10 to 5.10.83

[openwrt/staging/wigyori.git] / target / linux / ipq806x / patches-5.10 / 108-v5.14-net-stmmac-explicitly-deassert-gmac-ahb-reset.patch

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 a797492beeee56191569807abd18693d2f63cacf..2bcf17751a61820974dc7e64e43e16010f131b8a 100644 (file)
--- 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
-@@ -4990,6 +4990,10 @@ int stmmac_dvr_probe(struct device *devi
+@@ -5023,6 +5023,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)
-@@ -5214,6 +5218,7 @@ int stmmac_dvr_remove(struct device *dev
+@@ -5247,6 +5251,7 @@ int stmmac_dvr_remove(struct device *dev
        phylink_destroy(priv->phylink);
        if (priv->plat->stmmac_rst)
                reset_control_assert(priv->plat->stmmac_rst);
@@ -50,7 +50,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        if (priv->hw->pcs != STMMAC_PCS_TBI &&
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
-@@ -616,6 +616,12 @@ stmmac_probe_config_dt(struct platform_d
+@@ -617,6 +617,12 @@ stmmac_probe_config_dt(struct platform_d
                plat->stmmac_rst = NULL;
        }