common: Drop linux/delay.h from common header

[oweals/u-boot.git] / drivers / net / phy / realtek.c

diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index dd45e11b3ad9852ef2cf9afada767dce6ab7a9bd..b4612c1cfd6c8272f04806866174aa93f51f3852 100644 (file)
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -9,9 +9,11 @@
 #include <common.h>
 #include <linux/bitops.h>
 #include <phy.h>
+#include <linux/delay.h>
 
 #define PHY_RTL8211x_FORCE_MASTER BIT(1)
 #define PHY_RTL8211E_PINE64_GIGABIT_FIX BIT(2)
+#define PHY_RTL8211F_FORCE_EEE_RXC_ON BIT(3)
 
 #define PHY_AUTONEGOTIATE_TIMEOUT 5000
 
@@ -55,6 +57,7 @@
 
 #define MIIM_RTL8211F_PAGE_SELECT      0x1f
 #define MIIM_RTL8211F_TX_DELAY         0x100
+#define MIIM_RTL8211F_RX_DELAY         0x8
 #define MIIM_RTL8211F_LCR              0x10
 
 static int rtl8211f_phy_extread(struct phy_device *phydev, int addr,
@@ -102,6 +105,15 @@ static int rtl8211e_probe(struct phy_device *phydev)
        return 0;
 }
 
+static int rtl8211f_probe(struct phy_device *phydev)
+{
+#ifdef CONFIG_RTL8211F_PHY_FORCE_EEE_RXC_ON
+       phydev->flags |= PHY_RTL8211F_FORCE_EEE_RXC_ON;
+#endif
+
+       return 0;
+}
+
 /* RealTek RTL8211x */
 static int rtl8211x_config(struct phy_device *phydev)
 {
@@ -151,6 +163,14 @@ static int rtl8211f_config(struct phy_device *phydev)
 {
        u16 reg;
 
+       if (phydev->flags & PHY_RTL8211F_FORCE_EEE_RXC_ON) {
+               unsigned int reg;
+
+               reg = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1);
+               reg &= ~MDIO_PCS_CTRL1_CLKSTOP_EN;
+               phy_write_mmd(phydev, MDIO_MMD_PCS, MDIO_CTRL1, reg);
+       }
+
        phy_write(phydev, MDIO_DEVAD_NONE, MII_BMCR, BMCR_RESET);
 
        phy_write(phydev, MDIO_DEVAD_NONE,
@@ -165,6 +185,16 @@ static int rtl8211f_config(struct phy_device *phydev)
                reg &= ~MIIM_RTL8211F_TX_DELAY;
 
        phy_write(phydev, MDIO_DEVAD_NONE, 0x11, reg);
+
+       /* enable RX-delay for rgmii-id and rgmii-rxid, otherwise disable it */
+       reg = phy_read(phydev, MDIO_DEVAD_NONE, 0x15);
+       if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+           phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+               reg |= MIIM_RTL8211F_RX_DELAY;
+       else
+               reg &= ~MIIM_RTL8211F_RX_DELAY;
+       phy_write(phydev, MDIO_DEVAD_NONE, 0x15, reg);
+
        /* restore to default page 0 */
        phy_write(phydev, MDIO_DEVAD_NONE,
                  MIIM_RTL8211F_PAGE_SELECT, 0x0);
@@ -360,6 +390,7 @@ static struct phy_driver RTL8211F_driver = {
        .uid = 0x1cc916,
        .mask = 0xffffff,
        .features = PHY_GBIT_FEATURES,
+       .probe = &rtl8211f_probe,
        .config = &rtl8211f_config,
        .startup = &rtl8211f_startup,
        .shutdown = &genphy_shutdown,