GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-25 16:41:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

blackfin: Initialize the EMAC VLAN with proper default value

Browse source 
EMAC_VLANx regs is not properly initiallized in u-boot, once it's overwrite in the
kernel when DSA enabled, hot reset will lead to bringing up EMAC fail in u-boot.

Signed-off-by: Aaron Wu <Aaron.Wu@analog.com>
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
This commit is contained in:
Aaron Wu 2011-11-23 11:23:56 +08:00 • committed by Sonic Zhang
parent 861aa63d6b
commit 819ca38fa7
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/blackfin/include/asm/mach-common/bits/emac.h
View file

@ -217,4 +217,7 @@
#define TX_GE1024_CNT 0x00200000 /* 1024-Max-Byte TX Frames Sent */ #define TX_GE1024_CNT 0x00200000 /* 1024-Max-Byte TX Frames Sent */
#define TX_ABORT_CNT 0x00400000 /* TX Frames Aborted */ #define TX_ABORT_CNT 0x00400000 /* TX Frames Aborted */
/*default value for EMAC_VLANx reg*/
#define EMAC_VLANX_DEF_VAL 0xFFFF
#endif #endif

2
drivers/net/bfin_mac.c
View file

@ -259,6 +259,8 @@ static int bfin_miiphy_init(struct eth_device *dev, int *opmode)
*opmode = 0; *opmode = 0;
bfin_write_EMAC_MMC_CTL(RSTC | CROLL); bfin_write_EMAC_MMC_CTL(RSTC | CROLL);
bfin_write_EMAC_VLAN1(EMAC_VLANX_DEF_VAL);
bfin_write_EMAC_VLAN2(EMAC_VLANX_DEF_VAL);
/* Initialize the TX DMA channel registers */ /* Initialize the TX DMA channel registers */
bfin_write_DMA2_X_COUNT(0); bfin_write_DMA2_X_COUNT(0);