summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAndreas Bießmann <andreas.devel@googlemail.com>2010-10-07 09:44:46 +0200
committerBen Warren <biggerbadderben@gmail.com>2010-10-11 23:00:28 -0700
commite63ac4cf11b8c4a86c692b9c22c49402228a22c4 (patch)
tree9fe3a9996e5f905127da1377d8f4f671a55c381f /drivers/net
parenta61a81967f57cb657dea9289a1b0810c668bf9ae (diff)
downloadtalos-obmc-uboot-e63ac4cf11b8c4a86c692b9c22c49402228a22c4.tar.gz
talos-obmc-uboot-e63ac4cf11b8c4a86c692b9c22c49402228a22c4.zip
drivers/net/at91_emac.c: increase timeout for autonegotiation
This patch increases timeout for autonegotiation from 1 second to 3 seconds. Some boards (e.g. at91rm9200ek) did not negotiate within 1 second. Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/at91_emac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index d82459b1ce..6e42bfe1d7 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -208,7 +208,7 @@ static int at91emac_phy_reset(struct eth_device *netdev)
at91emac_write(emac, CONFIG_DRIVER_AT91EMAC_PHYADDR, MII_BMCR,
(BMCR_ANENABLE | BMCR_ANRESTART));
- for (i = 0; i < 100000 / 100; i++) {
+ for (i = 0; i < 30000; i++) {
at91emac_read(emac, CONFIG_DRIVER_AT91EMAC_PHYADDR,
MII_BMSR, &status);
if (status & BMSR_ANEGCOMPLETE)
OpenPOWER on IntegriCloud