Browse Source

net: stmmac: Use msleep rather then udelay for reset delay

The reset delays used for stmmac are in the order of 10ms to 1 second,
which is far too long for udelay usage, so switch to using msleep.

Practically this fixes the PHY not being reliably detected in some cases
as udelay wouldn't actually delay for long enough to let the phy
reliably be reset.

Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Sjoerd Simons 10 years ago
parent
commit
892aa01df2
1 changed files with 8 additions and 3 deletions
  1. 8 3
      drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

+ 8 - 3
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

@@ -161,11 +161,16 @@ int stmmac_mdio_reset(struct mii_bus *bus)
 
 
 		if (!gpio_request(reset_gpio, "mdio-reset")) {
 		if (!gpio_request(reset_gpio, "mdio-reset")) {
 			gpio_direction_output(reset_gpio, active_low ? 1 : 0);
 			gpio_direction_output(reset_gpio, active_low ? 1 : 0);
-			udelay(data->delays[0]);
+			if (data->delays[0])
+				msleep(DIV_ROUND_UP(data->delays[0], 1000));
+
 			gpio_set_value(reset_gpio, active_low ? 0 : 1);
 			gpio_set_value(reset_gpio, active_low ? 0 : 1);
-			udelay(data->delays[1]);
+			if (data->delays[1])
+				msleep(DIV_ROUND_UP(data->delays[1], 1000));
+
 			gpio_set_value(reset_gpio, active_low ? 1 : 0);
 			gpio_set_value(reset_gpio, active_low ? 1 : 0);
-			udelay(data->delays[2]);
+			if (data->delays[2])
+				msleep(DIV_ROUND_UP(data->delays[2], 1000));
 		}
 		}
 	}
 	}
 #endif
 #endif