minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 05:55:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

FEC: Kill mode select FIXME's

Browse Source 
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Ben Warren <biggerbadderben@gmail.com>
Cc: Stefano Babic <sbabic@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Detlev Zundel <dzu@denx.de>
This commit is contained in:
Marek Vasut 2011-09-11 18:05:31 +00:00 committed by Albert ARIBAUD
parent 77dbd6ab7f
commit 9eb3770b7b
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/fec_mxc.c
View File

@ -400,6 +400,7 @@ static int fec_init(struct eth_device *dev, bd_t* bd)
{ {
uint32_t base; uint32_t base;
struct fec_priv *fec = (struct fec_priv *)dev->priv; struct fec_priv *fec = (struct fec_priv *)dev->priv;
uint32_t rcntrl;
/* Initialize MAC address */ /* Initialize MAC address */
fec_set_hwaddr(dev); fec_set_hwaddr(dev);
@ -442,19 +443,19 @@ static int fec_init(struct eth_device *dev, bd_t* bd)
/* /*
* Set FEC-Lite receive control register(R_CNTRL): * Set FEC-Lite receive control register(R_CNTRL):
*/ */
if (fec->xcv_type == SEVENWIRE) {
/*
* Frame length=1518; 7-wire mode
*/
writel(0x05ee0020, &fec->eth->r_cntrl); /* FIXME 0x05ee0000 */
} else {
/*
* Frame length=1518; MII mode;
*/
writel(0x05ee0024, &fec->eth->r_cntrl); /* FIXME 0x05ee0004 */
/* Start with frame length = 1518, common for all modes. */
rcntrl = PKTSIZE << FEC_RCNTRL_MAX_FL_SHIFT;
if (fec->xcv_type == SEVENWIRE)
rcntrl |= FEC_RCNTRL_FCE;
else /* MII mode */
rcntrl |= FEC_RCNTRL_FCE | FEC_RCNTRL_MII_MODE;
writel(rcntrl, &fec->eth->r_cntrl);
if (fec->xcv_type == MII10 || fec->xcv_type == MII100)
fec_mii_setspeed(fec); fec_mii_setspeed(fec);
}
/* /*
* Set Opcode/Pause Duration Register * Set Opcode/Pause Duration Register
*/ */
@ -731,7 +732,8 @@ static int fec_probe(bd_t *bd)
/* /*
* Frame length=1518; MII mode; * Frame length=1518; MII mode;
*/ */
writel(0x05ee0024, &fec->eth->r_cntrl); /* FIXME 0x05ee0004 */ writel((PKTSIZE << FEC_RCNTRL_MAX_FL_SHIFT) | FEC_RCNTRL_FCE |
FEC_RCNTRL_MII_MODE, &fec->eth->r_cntrl);
fec_mii_setspeed(fec); fec_mii_setspeed(fec);
sprintf(edev->name, "FEC"); sprintf(edev->name, "FEC");