From: Michal Simek <michal.simek@xilinx.com>
Date: Fri, 21 Dec 2018 07:35:30 +0000 (+0100)
Subject: net: phy: Fix logic around gmiitorgmii wiring
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab4ddeeb3828c66f150c3d0f7f1582cdfc7664a4;p=thirdparty%2Fu-boot.git

net: phy: Fix logic around gmiitorgmii wiring

There is no reason to try to connect gmii2rgmii bridge if fixed phy is
detected already. Check phydev before gmii2rgmii bridge is connected.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index d02c4d8ac83..baa6dd9f9c9 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -959,7 +959,8 @@ struct phy_device *phy_connect(struct mii_dev *bus, int addr,
 	phydev = phy_connect_fixed(bus, dev, interface);
 #endif
 #ifdef CONFIG_PHY_XILINX_GMII2RGMII
-	phydev = phy_connect_gmii2rgmii(bus, dev, interface);
+	if (!phydev)
+		phydev = phy_connect_gmii2rgmii(bus, dev, interface);
 #endif
 
 	if (!phydev)