diff options
| author | Ben Gardiner <bengardiner@nanometrics.ca> | 2011-01-11 14:48:17 -0500 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-04-11 21:28:44 +0200 |
| commit | 7d2fade7b1cd08432d16f7af5b10a8d1c0213813 (patch) | |
| tree | 105d3d8bd36b3447dfbf40bd452e6fb4fd946f39 | |
| parent | fa9cd788bcefc7a292461e62ca28051f72330217 (diff) | |
ea20: fix undefined PHY_* errors
This patch fixes ea20 after 8ef583a0351590a91394499eb5ca2ab8a703d959 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>
| -rw-r--r-- | drivers/net/davinci_emac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index c359f54f9..66c0d13c2 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -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); |