summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBo Shen <voice.shen@atmel.com>2015-03-04 13:35:16 +0800
committerAndreas Bießmann <andreas.devel@googlemail.com>2015-03-18 23:36:09 +0100
commitc83cb5f665c11eb0231bb32c3f1094bb55139024 (patch)
treedc00eaae91bcf7d2ffef65b33190cecfaf6ba8ea /drivers
parent993ea97e76ba0ceec39c50fea56143506532fa16 (diff)
downloadtalos-obmc-uboot-c83cb5f665c11eb0231bb32c3f1094bb55139024.tar.gz
talos-obmc-uboot-c83cb5f665c11eb0231bb32c3f1094bb55139024.zip
Net: macb: reset GBE bit when fallback checking
If the GBE bit is set, when do next time autonegotiation, if the result is not 1000Mbps, it will fallback to 100Mbps checking. So, we need to clear the GBE bit. Signed-off-by: Bo Shen <voice.shen@atmel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/macb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 9c2ff487a7..170ff0646f 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -515,7 +515,7 @@ static int macb_phy_init(struct macb_device *macb)
lpa);
ncfgr = macb_readl(macb, NCFGR);
- ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD));
+ ncfgr &= ~(MACB_BIT(SPD) | MACB_BIT(FD) | GEM_BIT(GBE));
if (speed)
ncfgr |= MACB_BIT(SPD);
if (duplex)
OpenPOWER on IntegriCloud