mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 06:00:43 +00:00
net: emaclite: Move RX/TX ping pong initialization to
Init RX/TX ping pong directly from board not in the driver. Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
parent
9b94755af9
commit
c1044a1ec1
3 changed files with 18 additions and 14 deletions
|
@ -71,12 +71,18 @@ int fsl_init2 (void) {
|
|||
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
/*
|
||||
* This board either has PCI NICs or uses the CPU's TSECs
|
||||
* pci_eth_init() will return 0 if no NICs found, so in that case
|
||||
* returning -1 will force cpu_eth_init() to be called.
|
||||
*/
|
||||
int ret = 0;
|
||||
#ifdef CONFIG_XILINX_EMACLITE
|
||||
return xilinx_emaclite_initialize(bis, XILINX_EMACLITE_BASEADDR);
|
||||
u32 txpp = 0;
|
||||
u32 rxpp = 0;
|
||||
# ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
|
||||
txpp = 1;
|
||||
# endif
|
||||
# ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG
|
||||
rxpp = 1;
|
||||
# endif
|
||||
ret |= xilinx_emaclite_initialize(bis, XILINX_EMACLITE_BASEADDR,
|
||||
txpp, rxpp);
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
|
|
@ -342,7 +342,8 @@ static int emaclite_recv(struct eth_device *dev)
|
|||
|
||||
}
|
||||
|
||||
int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr)
|
||||
int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr,
|
||||
int txpp, int rxpp)
|
||||
{
|
||||
struct eth_device *dev;
|
||||
struct xemaclite *emaclite;
|
||||
|
@ -359,12 +360,8 @@ int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr)
|
|||
|
||||
dev->priv = emaclite;
|
||||
|
||||
#ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
|
||||
emaclite->txpp = 1;
|
||||
#endif
|
||||
#ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG
|
||||
emaclite->rxpp = 1;
|
||||
#endif
|
||||
emaclite->txpp = txpp;
|
||||
emaclite->rxpp = rxpp;
|
||||
|
||||
sprintf(dev->name, "Xelite.%lx", base_addr);
|
||||
|
||||
|
|
|
@ -97,7 +97,8 @@ int uli526x_initialize(bd_t *bis);
|
|||
int armada100_fec_register(unsigned long base_addr);
|
||||
int xilinx_axiemac_initialize(bd_t *bis, unsigned long base_addr,
|
||||
unsigned long dma_addr);
|
||||
int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr);
|
||||
int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr,
|
||||
int txpp, int rxpp);
|
||||
|
||||
/* Boards with PCI network controllers can call this from their board_eth_init()
|
||||
* function to initialize whatever's on board.
|
||||
|
|
Loading…
Reference in a new issue