From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 17 Jul 2025 17:56:56 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f24775c325900a683085c305fc9a403c490e667d;p=thirdparty%2Fkernel%2Fstable.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR (net-6.17-rc2).

No conflicts.

Adjacent changes:

drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
  d7a276a5768f ("net: stmmac: rk: convert to suspend()/resume() methods")
  de1e963ad064 ("net: stmmac: rk: put the PHY clock on remove")

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---

f24775c325900a683085c305fc9a403c490e667d
diff --cc drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index ac8288301994a,f6687c2f30f64..7c898768d5448
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@@ -1793,8 -1771,42 +1794,11 @@@ static void rk_gmac_remove(struct platf
  	stmmac_dvr_remove(&pdev->dev);
  
  	rk_gmac_powerdown(bsp_priv);
+ 
+ 	if (priv->plat->phy_node && bsp_priv->integrated_phy)
+ 		clk_put(bsp_priv->clk_phy);
  }
  
 -#ifdef CONFIG_PM_SLEEP
 -static int rk_gmac_suspend(struct device *dev)
 -{
 -	struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(dev);
 -	int ret = stmmac_suspend(dev);
 -
 -	/* Keep the PHY up if we use Wake-on-Lan. */
 -	if (!device_may_wakeup(dev)) {
 -		rk_gmac_powerdown(bsp_priv);
 -		bsp_priv->suspended = true;
 -	}
 -
 -	return ret;
 -}
 -
 -static int rk_gmac_resume(struct device *dev)
 -{
 -	struct rk_priv_data *bsp_priv = get_stmmac_bsp_priv(dev);
 -
 -	/* The PHY was up for Wake-on-Lan. */
 -	if (bsp_priv->suspended) {
 -		rk_gmac_powerup(bsp_priv);
 -		bsp_priv->suspended = false;
 -	}
 -
 -	return stmmac_resume(dev);
 -}
 -#endif /* CONFIG_PM_SLEEP */
 -
 -static SIMPLE_DEV_PM_OPS(rk_gmac_pm_ops, rk_gmac_suspend, rk_gmac_resume);
 -
  static const struct of_device_id rk_gmac_dwmac_match[] = {
  	{ .compatible = "rockchip,px30-gmac",	.data = &px30_ops   },
  	{ .compatible = "rockchip,rk3128-gmac", .data = &rk3128_ops },