Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[karo-tx-uboot.git] / drivers / net / phy / teranetics.c

diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index a13b48cee6eb602643c2d6baa3bae92350237de1..84ce7362f064f71ccff6793d403c40993dbb97c5 100644 (file)
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -21,6 +21,7 @@
  *
  */
 #include <config.h>
+#include <common.h>
 #include <phy.h>
 
 #ifndef CONFIG_PHYLIB_10G
@@ -33,9 +34,21 @@ int tn2020_config(struct phy_device *phydev)
                unsigned short restart_an = (MDIO_AN_CTRL1_RESTART |
                                                MDIO_AN_CTRL1_ENABLE |
                                                MDIO_AN_CTRL1_XNP);
+               u8 phy_hwversion;
 
-               phy_write(phydev, 30, 93, 2);
-               phy_write(phydev, MDIO_MMD_AN, MDIO_CTRL1, restart_an);
+               /*
+                * bit 15:12 of register 30.32 indicates PHY hardware
+                * version. It can be used to distinguish TN80xx from
+                * TN2020. TN2020 needs write 0x2 to 30.93, but TN80xx
+                * needs 0x1.
+                */
+               phy_hwversion = (phy_read(phydev, 30, 32) >> 12) & 0xf;
+               if (phy_hwversion <= 3) {
+                       phy_write(phydev, 30, 93, 2);
+                       phy_write(phydev, MDIO_MMD_AN, MDIO_CTRL1, restart_an);
+               } else {
+                       phy_write(phydev, 30, 93, 1);
+               }
        }
 
        return 0;
@@ -43,6 +56,38 @@ int tn2020_config(struct phy_device *phydev)
 
 int tn2020_startup(struct phy_device *phydev)
 {
+       unsigned int timeout = 5 * 1000; /* 5 second timeout */
+
+#define MDIO_PHYXS_LANE_READY (MDIO_PHYXS_LNSTAT_SYNC0 | \
+                              MDIO_PHYXS_LNSTAT_SYNC1 | \
+                              MDIO_PHYXS_LNSTAT_SYNC2 | \
+                              MDIO_PHYXS_LNSTAT_SYNC3 | \
+                              MDIO_PHYXS_LNSTAT_ALIGN)
+
+       /*
+        * Wait for the XAUI-SERDES lanes to align first.  Under normal
+        * circumstances, this can take up to three seconds.
+        */
+       while (--timeout) {
+               int reg = phy_read(phydev, MDIO_MMD_PHYXS, MDIO_PHYXS_LNSTAT);
+               if (reg < 0) {
+                       printf("TN2020: Error reading from PHY at "
+                              "address %u\n", phydev->addr);
+                       break;
+               }
+               if ((reg & MDIO_PHYXS_LANE_READY) == MDIO_PHYXS_LANE_READY)
+                       break;
+               udelay(1000);
+       }
+       if (!timeout) {
+               /*
+                * A timeout is bad, but it may not be fatal, so don't
+                * return an error.  Display a warning instead.
+                */
+               printf("TN2020: Timeout waiting for PHY at address %u to "
+                      "align.\n", phydev->addr);
+       }
+
        if (phydev->port != PORT_FIBRE)
                return gen10g_startup(phydev);
 
@@ -62,7 +107,7 @@ int tn2020_startup(struct phy_device *phydev)
 
 struct phy_driver tn2020_driver = {
        .name = "Teranetics TN2020",
-       .uid = 0x00a19410,
+       .uid = PHY_UID_TN2020,
        .mask = 0xfffffff0,
        .features = PHY_10G_FEATURES,
        .mmds = (MDIO_DEVS_PMAPMD | MDIO_DEVS_PCS |