diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2006-12-01 20:02:30 +0100 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2006-12-01 20:02:30 +0100 |
| commit | 701f649aa304e547639fb8bbfdfec0753e9b3b9a (patch) | |
| tree | cf491729e5ca4a222a7fd7fe7205e5157de05f77 /drivers/tsec.c | |
| parent | 5c97aeb8d8b780b10a1cb0beaca196c009f5a62a (diff) | |
| parent | dd520bf314c7add4183c5191692180f576f96b60 (diff) | |
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'drivers/tsec.c')
| -rw-r--r-- | drivers/tsec.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/tsec.c b/drivers/tsec.c index 400e593adfe..2524e4f6d2b 100644 --- a/drivers/tsec.c +++ b/drivers/tsec.c @@ -610,11 +610,10 @@ static void adjust_link(struct eth_device *dev) regs->maccfg2 = ((regs->maccfg2 & ~(MACCFG2_IF)) | MACCFG2_MII); - /* If We're in reduced mode, we need - * to say whether we're 10 or 100 MB. + /* Set R100 bit in all modes although + * it is only used in RGMII mode */ - if ((priv->speed == 100) - && (priv->flags & TSEC_REDUCED)) + if (priv->speed == 100) regs->ecntrl |= ECNTRL_R100; else regs->ecntrl &= ~(ECNTRL_R100); @@ -816,6 +815,7 @@ struct phy_info phy_info_M88E1111S = { {0x1d, 0x5, NULL}, {0x1e, 0x0, NULL}, {0x1e, 0x100, NULL}, + {0x14, 0x0cd2, NULL}, /* Delay RGMII TX and RX */ {MIIM_GBIT_CONTROL, MIIM_GBIT_CONTROL_INIT, NULL}, {MIIM_ANAR, MIIM_ANAR_INIT, NULL}, {MIIM_CONTROL, MIIM_CONTROL_RESET, NULL}, @@ -1110,10 +1110,8 @@ struct phy_info phy_info_dp83865 = { }; struct phy_info *phy_info[] = { -#if 0 - &phy_info_cis8201, -#endif &phy_info_cis8204, + &phy_info_cis8201, &phy_info_M88E1011S, &phy_info_M88E1111S, &phy_info_M88E1145, |