diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-07-12 08:23:58 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-07-12 08:23:58 +0200 |
| commit | 0878222fed3fafbfd0b1f2e5a6b2da90a81e910d (patch) | |
| tree | f88ba4ad1c5f06e6a772d5062c526d8153a71678 /drivers/net/designware.c | |
| parent | 0b15d51ed07db4c318d9c6b02b394ba5a3bc4296 (diff) | |
| parent | 154177e14a141468374f438ed3096ab097b79976 (diff) | |
| download | u-boot-0878222fed3fafbfd0b1f2e5a6b2da90a81e910d.zip u-boot-0878222fed3fafbfd0b1f2e5a6b2da90a81e910d.tar.gz u-boot-0878222fed3fafbfd0b1f2e5a6b2da90a81e910d.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot-net into next
* 'next' of git://git.denx.de/u-boot-net:
net: Inline the new eth_setenv_enetaddr_by_index function
net: allow setting env enetaddr from net device setting
net/designware: Consecutive writes to the same register to be avoided
CACHE: net: asix: Fix asix driver to work with data cache on
net: phy: micrel: make ksz9021 phy accessible
net: abort network initialization if the PHY driver fails
phylib: phy_startup() should return an error code on failure
net: tftp: fix type of block arg to store_block
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'drivers/net/designware.c')
| -rw-r--r-- | drivers/net/designware.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 326d550..bf21a08 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -171,8 +171,8 @@ static int dw_eth_init(struct eth_device *dev, bd_t *bis) writel(FIXEDBURST | PRIORXTX_41 | BURST_16, &dma_p->busmode); - writel(FLUSHTXFIFO | readl(&dma_p->opmode), &dma_p->opmode); - writel(STOREFORWARD | TXSECONDFRAME, &dma_p->opmode); + writel(readl(&dma_p->opmode) | FLUSHTXFIFO | STOREFORWARD | + TXSECONDFRAME, &dma_p->opmode); conf = FRAMEBURSTENABLE | DISABLERXOWN; |