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

ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c 

ARM DaVinci: Remove duplicate code in cpu/arm926ejs/davinci/dp83848.c

Signed-off-by: Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
This commit is contained in:
Hugo Villeneuve 2008-09-12 02:20:47 +02:00 committed by Jean-Christophe PLAGNIOL-VILLARD
parent 03db53335c
commit b5b0344957
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cpu/arm926ejs/davinci/dp83848.c
View File

@ -64,29 +64,16 @@ int dp83848_get_link_speed(int phy_addr)
return(0); return(0);
/* Speed doesn't matter, there is no setting for it in EMAC... */ /* Speed doesn't matter, there is no setting for it in EMAC... */
if (tmp & DP83848_SPEED) { if (tmp & DP83848_DUPLEX) {
if (tmp & DP83848_DUPLEX) { /* set DM644x EMAC for Full Duplex */
/* set DM644x EMAC for Full Duplex */ emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE |
emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE | EMAC_MACCONTROL_FULLDUPLEX_ENABLE; EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
} else {
/*set DM644x EMAC for Half Duplex */
emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
}
return(1);
} else { } else {
if (tmp & DP83848_DUPLEX) { /*set DM644x EMAC for Half Duplex */
/* set DM644x EMAC for Full Duplex */ emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE | EMAC_MACCONTROL_FULLDUPLEX_ENABLE;
} else {
/*set DM644x EMAC for Half Duplex */
emac->MACCONTROL = EMAC_MACCONTROL_MIIEN_ENABLE;
}
return(1);
} }
return(0); return(1);
} }