diff options
| author | Nick Spence <nick.spence@freescale.com> | 2006-09-07 07:39:46 -0700 |
|---|---|---|
| committer | Kim Phillips <kim.phillips@freescale.com> | 2006-11-03 19:42:17 -0600 |
| commit | f484dc791a3932537213c43c654cc1295c64b84c (patch) | |
| tree | 4566fa159f8d25114a7b2bce2a2746059ecd88ac /drivers/tsec.c | |
| parent | ee58ea2689930669678fdcb27bf0cc5c341e18eb (diff) | |
| download | blackbird-obmc-uboot-f484dc791a3932537213c43c654cc1295c64b84c.tar.gz blackbird-obmc-uboot-f484dc791a3932537213c43c654cc1295c64b84c.zip | |
Added RGMII support to the TSECs and Marvell 881111 Phy
Added a phy initialization to adjust the RGMII RX and TX timing
Always set the R100 bit in 100 BaseT mode regardless of the TSEC mode
Signed-off-by: Nick Spence <nick.spence@freescale.com>
Diffstat (limited to 'drivers/tsec.c')
| -rw-r--r-- | drivers/tsec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tsec.c b/drivers/tsec.c index 400e593adf..6815c153d8 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}, |
