Patchwork [U-Boot,03/31] net/phy: fix select line for TN80xx

login
register
mail settings
Submitter York Sun
Date March 22, 2013, 5:29 p.m.
Message ID <1363973369-26110-3-git-send-email-yorksun@freescale.com>
Download mbox | patch
Permalink /patch/230178/
State Superseded
Headers show

Comments

York Sun - March 22, 2013, 5:29 p.m.
From: Shaohui Xie <Shaohui.Xie@freescale.com>

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>
---
 drivers/net/phy/teranetics.c |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
Wolfgang Denk - March 22, 2013, 8:59 p.m.
Dear York Sun,

In message <1363973369-26110-3-git-send-email-yorksun@freescale.com> you wrote:
> From: Shaohui Xie <Shaohui.Xie@freescale.com>
> 
> 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>
> ---
>  drivers/net/phy/teranetics.c |   15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)

CHECK: braces {} should be used on all arms of this statement
#136: FILE: drivers/net/phy/teranetics.c:46:
+               if (phy_hwversion <= 3) {
[...]
+               } else
[...]


Best regards,

Wolfgang Denk

Patch

diff --git a/drivers/net/phy/teranetics.c b/drivers/net/phy/teranetics.c
index 78447b7..c0f13b8 100644
--- a/drivers/net/phy/teranetics.c
+++ b/drivers/net/phy/teranetics.c
@@ -34,9 +34,20 @@  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;