aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/spider_net.c2
-rw-r--r--drivers/net/spider_net.h16
2 files changed, 12 insertions, 6 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c
index 0aed69382b28..2f54cddf75ab 100644
--- a/drivers/net/spider_net.c
+++ b/drivers/net/spider_net.c
@@ -1614,7 +1614,7 @@ spider_net_enable_card(struct spider_net_card *card)
1614 SPIDER_NET_INT2_MASK_VALUE); 1614 SPIDER_NET_INT2_MASK_VALUE);
1615 1615
1616 spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR, 1616 spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,
1617 SPIDER_NET_GDTDCEIDIS); 1617 SPIDER_NET_GDTBSTA | SPIDER_NET_GDTDCEIDIS);
1618} 1618}
1619 1619
1620/** 1620/**
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index b2e3570c0106..80f4d2739d49 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -191,7 +191,9 @@ extern char spider_net_driver_name[];
191#define SPIDER_NET_MACMODE_VALUE 0x00000001 191#define SPIDER_NET_MACMODE_VALUE 0x00000001
192#define SPIDER_NET_BURSTLMT_VALUE 0x00000200 /* about 16 us */ 192#define SPIDER_NET_BURSTLMT_VALUE 0x00000200 /* about 16 us */
193 193
194/* 1(0) enable r/tx dma 194/* DMAC control register GDMACCNTR
195 *
196 * 1(0) enable r/tx dma
195 * 0000000 fixed to 0 197 * 0000000 fixed to 0
196 * 198 *
197 * 000000 fixed to 0 199 * 000000 fixed to 0
@@ -200,6 +202,7 @@ extern char spider_net_driver_name[];
200 * 202 *
201 * 000000 fixed to 0 203 * 000000 fixed to 0
202 * 00 burst alignment: 128 bytes 204 * 00 burst alignment: 128 bytes
205 * 11 burst alignment: 1024 bytes
203 * 206 *
204 * 00000 fixed to 0 207 * 00000 fixed to 0
205 * 0 descr writeback size 32 bytes 208 * 0 descr writeback size 32 bytes
@@ -210,10 +213,13 @@ extern char spider_net_driver_name[];
210#define SPIDER_NET_DMA_RX_VALUE 0x80000000 213#define SPIDER_NET_DMA_RX_VALUE 0x80000000
211#define SPIDER_NET_DMA_RX_FEND_VALUE 0x00030003 214#define SPIDER_NET_DMA_RX_FEND_VALUE 0x00030003
212/* to set TX_DMA_EN */ 215/* to set TX_DMA_EN */
213#define SPIDER_NET_TX_DMA_EN 0x80000000 216#define SPIDER_NET_TX_DMA_EN 0x80000000
214#define SPIDER_NET_GDTDCEIDIS 0x00000302 217#define SPIDER_NET_GDTBSTA 0x00000300
215#define SPIDER_NET_DMA_TX_VALUE SPIDER_NET_TX_DMA_EN | \ 218#define SPIDER_NET_GDTDCEIDIS 0x00000002
216 SPIDER_NET_GDTDCEIDIS 219#define SPIDER_NET_DMA_TX_VALUE SPIDER_NET_TX_DMA_EN | \
220 SPIDER_NET_GDTBSTA | \
221 SPIDER_NET_GDTDCEIDIS
222
217#define SPIDER_NET_DMA_TX_FEND_VALUE 0x00030003 223#define SPIDER_NET_DMA_TX_FEND_VALUE 0x00030003
218 224
219/* SPIDER_NET_UA_DESCR_VALUE is OR'ed with the unicast address */ 225/* SPIDER_NET_UA_DESCR_VALUE is OR'ed with the unicast address */