V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

net: emaclite: Remove baseaddress from xemaclite 

Use dev->iobase instead of baseaddress.

Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Michal Simek 2011-08-25 12:36:39 +02:00
parent 28ae02e5af
commit 8d95ddbb5e
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/net/xilinx_emaclite.c
View File

@ -64,7 +64,6 @@
#define XEL_RSR_RECV_IE_MASK 0x00000008UL #define XEL_RSR_RECV_IE_MASK 0x00000008UL
typedef struct { typedef struct {
u32 baseaddress; /* Base address for device (IPIF) */
u32 nexttxbuffertouse; /* Next TX buffer to write to */ u32 nexttxbuffertouse; /* Next TX buffer to write to */
u32 nextrxbuffertouse; /* Next RX buffer to read from */ u32 nextrxbuffertouse; /* Next RX buffer to read from */
} xemaclite; } xemaclite;
@ -136,43 +135,44 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis)
{ {
debug ("EmacLite Initialization Started\n"); debug ("EmacLite Initialization Started\n");
memset (&emaclite, 0, sizeof (xemaclite)); memset (&emaclite, 0, sizeof (xemaclite));
emaclite.baseaddress = dev->iobase;
/* /*
* TX - TX_PING & TX_PONG initialization * TX - TX_PING & TX_PONG initialization
*/ */
/* Restart PING TX */ /* Restart PING TX */
out_be32 (emaclite.baseaddress + XEL_TSR_OFFSET, 0); out_be32 (dev->iobase + XEL_TSR_OFFSET, 0);
/* Copy MAC address */ /* Copy MAC address */
xemaclite_alignedwrite (dev->enetaddr, xemaclite_alignedwrite (dev->enetaddr,
emaclite.baseaddress, ENET_ADDR_LENGTH); dev->iobase, ENET_ADDR_LENGTH);
/* Set the length */ /* Set the length */
out_be32 (emaclite.baseaddress + XEL_TPLR_OFFSET, ENET_ADDR_LENGTH); out_be32 (dev->iobase + XEL_TPLR_OFFSET, ENET_ADDR_LENGTH);
/* Update the MAC address in the EMAC Lite */ /* Update the MAC address in the EMAC Lite */
out_be32 (emaclite.baseaddress + XEL_TSR_OFFSET, XEL_TSR_PROG_MAC_ADDR); out_be32 (dev->iobase + XEL_TSR_OFFSET, XEL_TSR_PROG_MAC_ADDR);
/* Wait for EMAC Lite to finish with the MAC address update */ /* Wait for EMAC Lite to finish with the MAC address update */
while ((in_be32 (emaclite.baseaddress + XEL_TSR_OFFSET) & while ((in_be32 (dev->iobase + XEL_TSR_OFFSET) &
XEL_TSR_PROG_MAC_ADDR) != 0) ; XEL_TSR_PROG_MAC_ADDR) != 0)
;
#ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG #ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
/* The same operation with PONG TX */ /* The same operation with PONG TX */
out_be32 (emaclite.baseaddress + XEL_TSR_OFFSET + XEL_BUFFER_OFFSET, 0); out_be32 (dev->iobase + XEL_TSR_OFFSET + XEL_BUFFER_OFFSET, 0);
xemaclite_alignedwrite (dev->enetaddr, emaclite.baseaddress + xemaclite_alignedwrite(dev->enetaddr, dev->iobase +
XEL_BUFFER_OFFSET, ENET_ADDR_LENGTH); XEL_BUFFER_OFFSET, ENET_ADDR_LENGTH);
out_be32 (emaclite.baseaddress + XEL_TPLR_OFFSET, ENET_ADDR_LENGTH); out_be32 (dev->iobase + XEL_TPLR_OFFSET, ENET_ADDR_LENGTH);
out_be32 (emaclite.baseaddress + XEL_TSR_OFFSET + XEL_BUFFER_OFFSET, out_be32 (dev->iobase + XEL_TSR_OFFSET + XEL_BUFFER_OFFSET,
XEL_TSR_PROG_MAC_ADDR); XEL_TSR_PROG_MAC_ADDR);
while ((in_be32 (emaclite.baseaddress + XEL_TSR_OFFSET + while ((in_be32 (dev->iobase + XEL_TSR_OFFSET +
XEL_BUFFER_OFFSET) & XEL_TSR_PROG_MAC_ADDR) != 0) ; XEL_BUFFER_OFFSET) & XEL_TSR_PROG_MAC_ADDR) != 0)
;
#endif #endif
/* /*
* RX - RX_PING & RX_PONG initialization * RX - RX_PING & RX_PONG initialization
*/ */
/* Write out the value to flush the RX buffer */ /* Write out the value to flush the RX buffer */
out_be32 (emaclite.baseaddress + XEL_RSR_OFFSET, XEL_RSR_RECV_IE_MASK); out_be32 (dev->iobase + XEL_RSR_OFFSET, XEL_RSR_RECV_IE_MASK);
#ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG #ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG
out_be32 (emaclite.baseaddress + XEL_RSR_OFFSET + XEL_BUFFER_OFFSET, out_be32 (dev->iobase + XEL_RSR_OFFSET + XEL_BUFFER_OFFSET,
XEL_RSR_RECV_IE_MASK); XEL_RSR_RECV_IE_MASK);
#endif #endif
@ -220,16 +220,16 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
if (!maxtry) { if (!maxtry) {
printf ("Error: Timeout waiting for ethernet TX buffer\n"); printf ("Error: Timeout waiting for ethernet TX buffer\n");
/* Restart PING TX */ /* Restart PING TX */
out_be32 (emaclite.baseaddress + XEL_TSR_OFFSET, 0); out_be32 (dev->iobase + XEL_TSR_OFFSET, 0);
#ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG #ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
out_be32 (emaclite.baseaddress + XEL_TSR_OFFSET + out_be32 (dev->iobase + XEL_TSR_OFFSET +
XEL_BUFFER_OFFSET, 0); XEL_BUFFER_OFFSET, 0);
#endif #endif
return -1; return -1;
} }
/* Determine the expected TX buffer address */ /* Determine the expected TX buffer address */
baseaddress = (emaclite.baseaddress + emaclite.nexttxbuffertouse); baseaddress = (dev->iobase + emaclite.nexttxbuffertouse);
/* Determine if the expected buffer address is empty */ /* Determine if the expected buffer address is empty */
reg = in_be32 (baseaddress + XEL_TSR_OFFSET); reg = in_be32 (baseaddress + XEL_TSR_OFFSET);
@ -261,7 +261,7 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
if (((reg & XEL_TSR_XMIT_BUSY_MASK) == 0) if (((reg & XEL_TSR_XMIT_BUSY_MASK) == 0)
&& ((in_be32 ((baseaddress) + XEL_TSR_OFFSET) && ((in_be32 ((baseaddress) + XEL_TSR_OFFSET)
& XEL_TSR_XMIT_ACTIVE_MASK) == 0)) { & XEL_TSR_XMIT_ACTIVE_MASK) == 0)) {
debug ("Send packet from 0x%x\n", baseaddress); debug("Send packet from 0x%x\n", baseaddress);
/* Write the frame to the buffer */ /* Write the frame to the buffer */
xemaclite_alignedwrite ((void *) ptr, baseaddress, len); xemaclite_alignedwrite ((void *) ptr, baseaddress, len);
out_be32 (baseaddress + XEL_TPLR_OFFSET,(len & out_be32 (baseaddress + XEL_TPLR_OFFSET,(len &
@ -285,7 +285,7 @@ static int emaclite_recv(struct eth_device *dev)
u32 reg; u32 reg;
u32 baseaddress; u32 baseaddress;
baseaddress = emaclite.baseaddress + emaclite.nextrxbuffertouse; baseaddress = dev->iobase + emaclite.nextrxbuffertouse;
reg = in_be32 (baseaddress + XEL_RSR_OFFSET); reg = in_be32 (baseaddress + XEL_RSR_OFFSET);
debug ("Testing data at address 0x%x\n", baseaddress); debug ("Testing data at address 0x%x\n", baseaddress);
if ((reg & XEL_RSR_RECV_DONE_MASK) == XEL_RSR_RECV_DONE_MASK) { if ((reg & XEL_RSR_RECV_DONE_MASK) == XEL_RSR_RECV_DONE_MASK) {