Merge git://git.denx.de/u-boot-spi

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

diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index 62b8c1eb78776319cef00623291af60d5f178448..6d917f86f44d21537ffdd228316ec7e9ee86f9dc 100644 (file)
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -12,6 +12,8 @@
 #include <linux/bitops.h>
 #include <phy.h>
 
+#define PHY_RTL8211x_FORCE_MASTER BIT(1)
+
 #define PHY_AUTONEGOTIATE_TIMEOUT 5000
 
 /* RTL8211x 1000BASE-T Control Register */
@@ -49,6 +51,15 @@
 #define MIIM_RTL8211F_TX_DELAY         0x100
 #define MIIM_RTL8211F_LCR              0x10
 
+static int rtl8211b_probe(struct phy_device *phydev)
+{
+#ifdef CONFIG_RTL8211X_PHY_FORCE_MASTER
+       phydev->flags |= PHY_RTL8211x_FORCE_MASTER;
+#endif
+
+       return 0;
+}
+
 /* RealTek RTL8211x */
 static int rtl8211x_config(struct phy_device *phydev)
 {
@@ -59,14 +70,17 @@ static int rtl8211x_config(struct phy_device *phydev)
         */
        phy_write(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211x_PHY_INER,
                  MIIM_RTL8211x_PHY_INTR_DIS);
-#ifdef CONFIG_RTL8211X_PHY_FORCE_MASTER
-       unsigned int reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_CTRL1000);
-       /* force manual master/slave configuration */
-       reg |= MIIM_RTL8211x_CTRL1000T_MSCE;
-       /* force master mode */
-       reg |= MIIM_RTL8211x_CTRL1000T_MASTER;
-       phy_write(phydev, MDIO_DEVAD_NONE, MII_CTRL1000, reg);
-#endif
+
+       if (phydev->flags & PHY_RTL8211x_FORCE_MASTER) {
+               unsigned int reg;
+
+               reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_CTRL1000);
+               /* force manual master/slave configuration */
+               reg |= MIIM_RTL8211x_CTRL1000T_MSCE;
+               /* force master mode */
+               reg |= MIIM_RTL8211x_CTRL1000T_MASTER;
+               phy_write(phydev, MDIO_DEVAD_NONE, MII_CTRL1000, reg);
+       }
        /* read interrupt status just to clear it */
        phy_read(phydev, MDIO_DEVAD_NONE, MIIM_RTL8211x_PHY_INER);
 
@@ -81,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,
@@ -249,6 +267,7 @@ static struct phy_driver RTL8211B_driver = {
        .uid = 0x1cc912,
        .mask = 0xffffff,
        .features = PHY_GBIT_FEATURES,
+       .probe = &rtl8211b_probe,
        .config = &rtl8211x_config,
        .startup = &rtl8211x_startup,
        .shutdown = &genphy_shutdown,