summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-03-20 07:01:00 -0400
committerTom Rini <trini@konsulko.com>2015-03-20 07:01:00 -0400
commite6f4042a04195be258f79e33abe3b71af9162862 (patch)
treec386524124d1c95eb75e478ff271735454a04029 /drivers
parenta538ae997ae4cb375ba5362b50ba3f5b35f9519b (diff)
parent8e7a96364bc29073e5246d331a11ce8602d5d6a3 (diff)
downloadu-boot-imx-e6f4042a04195be258f79e33abe3b71af9162862.zip
u-boot-imx-e6f4042a04195be258f79e33abe3b71af9162862.tar.gz
u-boot-imx-e6f4042a04195be258f79e33abe3b71af9162862.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-atmel
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 9c2ff48..170ff06 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)