Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ded8028a authored by Linas Vepstas's avatar Linas Vepstas Committed by Jeff Garzik
Browse files

[PATCH] Spidernet fix register field definitions 



This patch fixes the names of a few fields in the DMA control
register. There is no functional change.

Signed-off-by: default avatarLinas Vepstas <linas@austin.ibm.com>
Cc: James K Lewis <jklewis@us.ibm.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 917a5b8e

drivers/net/spider_net.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1614,7 +1614,7 @@ spider_net_enable_card(struct spider_net_card *card) 
			     SPIDER_NET_INT2_MASK_VALUE);

			     SPIDER_NET_INT2_MASK_VALUE);





	spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,

	spider_net_write_reg(card, SPIDER_NET_GDTDMACCNTR,

			     SPIDER_NET_GDTDCEIDIS);

			     SPIDER_NET_GDTBSTA | SPIDER_NET_GDTDCEIDIS);

}

}





/**

/**

drivers/net/spider_net.h

+11 −5
Original line number Original line Diff line number Diff line
@@ -191,7 +191,9 @@ extern char spider_net_driver_name[]; 
#define SPIDER_NET_MACMODE_VALUE	0x00000001

#define SPIDER_NET_MACMODE_VALUE	0x00000001

#define SPIDER_NET_BURSTLMT_VALUE	0x00000200 /* about 16 us */

#define SPIDER_NET_BURSTLMT_VALUE	0x00000200 /* about 16 us */





/* 1(0)					enable r/tx dma

/* DMAC control register GDMACCNTR

 *

 * 1(0)				enable r/tx dma

 *  0000000				fixed to 0

 *  0000000				fixed to 0

 *

 *

 *         000000			fixed to 0

 *         000000			fixed to 0
@@ -200,6 +202,7 @@ extern char spider_net_driver_name[]; 
 *

 *

 *                 000000		fixed to 0

 *                 000000		fixed to 0

 *                       00		burst alignment: 128 bytes

 *                       00		burst alignment: 128 bytes

 *                       11		burst alignment: 1024 bytes

 *

 *

 *                         00000	fixed to 0

 *                         00000	fixed to 0

 *                              0	descr writeback size 32 bytes

 *                              0	descr writeback size 32 bytes
@@ -211,9 +214,12 @@ extern char spider_net_driver_name[]; 
#define SPIDER_NET_DMA_RX_FEND_VALUE	0x00030003

#define SPIDER_NET_DMA_RX_FEND_VALUE	0x00030003

/* to set TX_DMA_EN */

/* to set TX_DMA_EN */

#define SPIDER_NET_TX_DMA_EN           0x80000000

#define SPIDER_NET_TX_DMA_EN           0x80000000

#define SPIDER_NET_GDTDCEIDIS		0x00000302

#define SPIDER_NET_GDTBSTA             0x00000300

#define SPIDER_NET_GDTDCEIDIS          0x00000002

#define SPIDER_NET_DMA_TX_VALUE        SPIDER_NET_TX_DMA_EN | \

#define SPIDER_NET_DMA_TX_VALUE        SPIDER_NET_TX_DMA_EN | \

                                       SPIDER_NET_GDTBSTA | \

                                       SPIDER_NET_GDTDCEIDIS

                                       SPIDER_NET_GDTDCEIDIS



#define SPIDER_NET_DMA_TX_FEND_VALUE	0x00030003

#define SPIDER_NET_DMA_TX_FEND_VALUE	0x00030003





/* SPIDER_NET_UA_DESCR_VALUE is OR'ed with the unicast address */

/* SPIDER_NET_UA_DESCR_VALUE is OR'ed with the unicast address */