Merge tag 'v2025.07-rc4' into next

Prepare v2025.07-rc4

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c
index 461805ae53f..703e22479d2 100644
--- a/drivers/net/zynq_gem.c
+++ b/drivers/net/zynq_gem.c
@@ -567,12 +567,14 @@ static int zynq_gem_init(struct udevice *dev)
 	}
 #endif
 
-	ret = clk_get_rate(&priv->tx_clk);
-	if (ret != clk_rate) {
-		ret = clk_set_rate(&priv->tx_clk, clk_rate);
-		if (IS_ERR_VALUE(ret)) {
-			dev_err(dev, "failed to set tx clock rate %ld\n", clk_rate);
-			return ret;
+	if (priv->interface != PHY_INTERFACE_MODE_MII) {
+		ret = clk_get_rate(&priv->tx_clk);
+		if (ret != clk_rate) {
+			ret = clk_set_rate(&priv->tx_clk, clk_rate);
+			if (IS_ERR_VALUE(ret)) {
+				dev_err(dev, "failed to set tx clock rate %ld\n", clk_rate);
+				return ret;
+			}
 		}
 	}