summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJoachim Foerster <joachim.foerster@missinglinkelectronics.com>2011-10-17 05:24:43 +0000
committerWolfgang Denk <wd@denx.de>2011-10-26 21:26:48 +0200
commit29095f1a5cfdbc2e40178f6fbf9267e0df11f6f5 (patch)
tree27c9e48b5e031a051937d59579d16fd744b7533d /drivers/net
parent337aff53f63ef404bdc42472a6a82f9224cafed6 (diff)
downloadu-boot-imx-29095f1a5cfdbc2e40178f6fbf9267e0df11f6f5.zip
u-boot-imx-29095f1a5cfdbc2e40178f6fbf9267e0df11f6f5.tar.gz
u-boot-imx-29095f1a5cfdbc2e40178f6fbf9267e0df11f6f5.tar.bz2
altera_tse: Fix SGDMA reset triggering
The SW_RESET needs to be set instead of being masked out! Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/altera_tse.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/altera_tse.c b/drivers/net/altera_tse.c
index 47d0047..47b5761 100644
--- a/drivers/net/altera_tse.c
+++ b/drivers/net/altera_tse.c
@@ -357,8 +357,8 @@ static void tse_eth_reset(struct eth_device *dev)
if (counter >= ALT_TSE_SGDMA_BUSY_WATCHDOG_CNTR) {
debug("Timeout waiting for rx sgdma!\n");
- rx_sgdma->control &= ALT_SGDMA_CONTROL_SOFTWARERESET_MSK;
- rx_sgdma->control &= ALT_SGDMA_CONTROL_SOFTWARERESET_MSK;
+ rx_sgdma->control = ALT_SGDMA_CONTROL_SOFTWARERESET_MSK;
+ rx_sgdma->control = ALT_SGDMA_CONTROL_SOFTWARERESET_MSK;
}
counter = 0;
@@ -370,8 +370,8 @@ static void tse_eth_reset(struct eth_device *dev)
if (counter >= ALT_TSE_SGDMA_BUSY_WATCHDOG_CNTR) {
debug("Timeout waiting for tx sgdma!\n");
- tx_sgdma->control &= ALT_SGDMA_CONTROL_SOFTWARERESET_MSK;
- tx_sgdma->control &= ALT_SGDMA_CONTROL_SOFTWARERESET_MSK;
+ tx_sgdma->control = ALT_SGDMA_CONTROL_SOFTWARERESET_MSK;
+ tx_sgdma->control = ALT_SGDMA_CONTROL_SOFTWARERESET_MSK;
}
/* reset the mac */
mac_dev->command_config.bits.transmit_enable = 1;