sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

ea20: fix undefined PHY_* errors 

This patch fixes ea20 after 8ef583a035 where
the u-boot custom PHY_ macros were replaced with those of linux/mii.h MII_
definitions except in the RMII support for davinci_emac. Probably also due to
the merge path of changes in 2010.12.

Signed-off-by: Ben Gardiner<bengardiner@nanometrics.ca>
CC: Mike Frysinger <vapier@gentoo.org>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Ben Gardiner 2011-01-11 14:48:17 -05:00 committed by Wolfgang Denk
parent fa9cd788bc
commit 7d2fade7b1
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/davinci_emac.c
View File

@ -247,10 +247,10 @@ static int gen_get_link_speed(int phy_addr)
(tmp & 0x04)) {
#if defined(CONFIG_DRIVER_TI_EMAC_USE_RMII) && \
defined(CONFIG_MACH_DAVINCI_DA850_EVM)
davinci_eth_phy_read(phy_addr, PHY_ANLPAR, &tmp);
davinci_eth_phy_read(phy_addr, MII_LPA, &tmp);
/* Speed doesn't matter, there is no setting for it in EMAC. */
if (tmp & (PHY_ANLPAR_TXFD | PHY_ANLPAR_10FD)) {
if (tmp & (LPA_100FULL | LPA_10FULL)) {
/* set EMAC for Full Duplex */
writel(EMAC_MACCONTROL_MIIEN_ENABLE |
EMAC_MACCONTROL_FULLDUPLEX_ENABLE,
@ -261,7 +261,7 @@ static int gen_get_link_speed(int phy_addr)
&adap_emac->MACCONTROL);
}
if (tmp & (PHY_ANLPAR_TXFD | PHY_ANLPAR_TX))
if (tmp & (LPA_100FULL | LPA_100HALF))
writel(readl(&adap_emac->MACCONTROL) |
EMAC_MACCONTROL_RMIISPEED_100,
&adap_emac->MACCONTROL);