[U-Boot] [PATCH] Revert "net: phy: delay only if reset handler is registered"

Fabio Estevam fabio.estevam at freescale.com
Tue Nov 17 17:25:46 CET 2015


This reverts commit 59370f3fcd135089c402c93720a87c688abe600c.

This commit breaks ethernet on at least mx6 Riotboard and
mx6sxsabresd boards.

Reported-by: Catalin Crenguta <catalin.crenguta at gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
---
 drivers/net/phy/phy.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index d7364ff..9e68f1d 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -771,13 +771,11 @@ struct phy_device *phy_find_by_mask(struct mii_dev *bus, unsigned phy_mask,
 		phy_interface_t interface)
 {
 	/* Reset the bus */
-	if (bus->reset) {
+	if (bus->reset)
 		bus->reset(bus);
 
-		/* Wait 15ms to make sure the PHY has come out of hard reset */
-		udelay(15000);
-	}
-
+	/* Wait 15ms to make sure the PHY has come out of hard reset */
+	udelay(15000);
 	return get_phy_device_by_mask(bus, phy_mask, interface);
 }
 
-- 
1.9.1



More information about the U-Boot mailing list