diff options
| author | Tom Rini <[email protected]> | 2017-09-07 14:48:23 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2017-09-07 14:48:23 -0400 |
| commit | ec6bc928bbe852a5dae242d24cfd28f868f6286c (patch) | |
| tree | ade207598033634b45378cfef46d3a9da0d99b2d /drivers | |
| parent | b5b82abcf59a063612b403f4169e121bf3a21351 (diff) | |
| parent | e4691564ccd366618934e70b7f621df7e1c5d70b (diff) | |
Merge git://git.denx.de/u-boot-net
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/fsl_mcdmafec.c | 2 | ||||
| -rw-r--r-- | drivers/net/mcffec.c | 2 | ||||
| -rw-r--r-- | drivers/net/mvneta.c | 2 | ||||
| -rw-r--r-- | drivers/net/phy/realtek.c | 24 |
4 files changed, 17 insertions, 13 deletions
diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index 26c714cc04d..2d89cea4a3e 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -391,7 +391,7 @@ static int fec_init(struct eth_device *dev, bd_t * bd) /* Set Opcode/Pause Duration Register */ fecp->opd = 0x00010020; - /* Setup Buffers and Buffer Desriptors */ + /* Setup Buffers and Buffer Descriptors */ info->rxIdx = 0; info->txIdx = 0; diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 39a67473209..ebcbed941a5 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -465,7 +465,7 @@ int fec_init(struct eth_device *dev, bd_t * bd) fecp->emrbr = PKT_MAXBLR_SIZE; /* - * Setup Buffers and Buffer Desriptors + * Setup Buffers and Buffer Descriptors */ info->rxIdx = 0; info->txIdx = 0; diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 50577d7f07a..f1be9521a91 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -540,7 +540,7 @@ static void mvneta_txq_pend_desc_add(struct mvneta_port *pp, u32 val; /* Only 255 descriptors can be added at once ; Assume caller - * process TX desriptors in quanta less than 256 + * process TX descriptors in quanta less than 256 */ val = pend_desc; mvreg_write(pp, MVNETA_TXQ_UPDATE_REG(txq->id), val); diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c index 635acf5844e..6d917f86f44 100644 --- a/drivers/net/phy/realtek.c +++ b/drivers/net/phy/realtek.c @@ -95,17 +95,21 @@ static int rtl8211f_config(struct phy_device *phydev) phy_write(phydev, MDIO_DEVAD_NONE, MII_BMCR, BMCR_RESET); - if (phydev->interface == PHY_INTERFACE_MODE_RGMII) { - /* enable TXDLY */ - phy_write(phydev, MDIO_DEVAD_NONE, - MIIM_RTL8211F_PAGE_SELECT, 0xd08); - reg = phy_read(phydev, MDIO_DEVAD_NONE, 0x11); + phy_write(phydev, MDIO_DEVAD_NONE, + MIIM_RTL8211F_PAGE_SELECT, 0xd08); + reg = phy_read(phydev, MDIO_DEVAD_NONE, 0x11); + + /* enable TX-delay for rgmii-id and rgmii-txid, otherwise disable it */ + if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || + phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) reg |= MIIM_RTL8211F_TX_DELAY; - phy_write(phydev, MDIO_DEVAD_NONE, 0x11, reg); - /* restore to default page 0 */ - phy_write(phydev, MDIO_DEVAD_NONE, - MIIM_RTL8211F_PAGE_SELECT, 0x0); - } + else + reg &= ~MIIM_RTL8211F_TX_DELAY; + + phy_write(phydev, MDIO_DEVAD_NONE, 0x11, reg); + /* restore to default page 0 */ + phy_write(phydev, MDIO_DEVAD_NONE, + MIIM_RTL8211F_PAGE_SELECT, 0x0); /* Set green LED for Link, yellow LED for Active */ phy_write(phydev, MDIO_DEVAD_NONE, |