From: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Date: Fri, 29 Mar 2019 08:54:05 +0000 (+0100)
Subject: net: phy: implement fallback mechanism for negative phy adresses
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=afbc31948a007e03d6a1282677aafc2208f45819;p=u-boot.git

net: phy: implement fallback mechanism for negative phy adresses

Negative phy-addresses can occour if the caller function was not able to
determine a valid phy address (from device-tree for example). In this
case we catch this here and search for ANY phy device on the given mdio-
bus.

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Tested-by: Michal Simek <michal.simek@xilinx.com>
Tested-by: Lukasz Majewski <lukma@denx.de>
---

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 0c8b29dae4..4e8d2943ee 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -922,13 +922,14 @@ struct phy_device *phy_connect(struct mii_dev *bus, int addr,
 #endif
 {
 	struct phy_device *phydev = NULL;
+	uint mask = (addr > 0) ? (1 << addr) : 0xffffffff;
 
 #ifdef CONFIG_PHY_FIXED
 	phydev = phy_connect_fixed(bus, dev, interface);
 #endif
 
 	if (!phydev)
-		phydev = phy_find_by_mask(bus, 1 << addr, interface);
+		phydev = phy_find_by_mask(bus, mask, interface);
 
 	if (phydev)
 		phy_connect_dev(phydev, dev);