summaryrefslogtreecommitdiff
path: root/drivers/net/designware.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-11-25 10:42:19 -0500
committerTom Rini <trini@ti.com>2013-11-25 10:42:19 -0500
commit1a1326d2da9b2904bc90fb2990f829cb1ecef312 (patch)
tree79b47ce3f6bbc48974d305eedebd0e473dc9a33d /drivers/net/designware.c
parentfaca8ff55f4a2cf45fb906cc37f44601149fc00e (diff)
parent2287286be4e268d3d4ec3c0347bf31479dbd1f05 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers/net/designware.c')
-rw-r--r--drivers/net/designware.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 8413d57767a..22155b4d949 100644
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -96,7 +96,7 @@ static int mac_reset(struct eth_device *dev)
ulong start;
int timeout = CONFIG_MACRESET_TIMEOUT;
- writel(DMAMAC_SRST, &dma_p->busmode);
+ writel(readl(&dma_p->busmode) | DMAMAC_SRST, &dma_p->busmode);
if (priv->interface != PHY_INTERFACE_MODE_RGMII)
writel(MII_PORTSELECT, &mac_p->conf);