net/phy: fix select line for TN80xx
authorShaohui Xie <Shaohui.Xie@freescale.com>
Mon, 25 Mar 2013 07:39:59 +0000 (07:39 +0000)
committerAndy Fleming <afleming@freescale.com>
Fri, 24 May 2013 21:54:09 +0000 (16:54 -0500)
TN80xx has same PHY ID as TN2020, but it needs different setting to register
30.93 which used to select line, so we read register 30.32 which has
bit 15:12 to indicate PHY hardware version, for TN20xx we will get 3 or 2,
for TN80xx we will get 5 or 4.

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: Andy Fleming <afleming@freescale.com>
drivers/net/phy/teranetics.c

index 78447b711f5e51a8fca4f072d4622618ace28d41..84ce7362f064f71ccff6793d403c40993dbb97c5 100644 (file)
@@ -34,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;