Re: [U-Boot] [PATCH v2] net/phy: refactor RTL8211F initialization

2015-05-04 Thread Joe Hershberger
On Fri, Apr 24, 2015 at 3:57 AM, Shengzhou Liu
 wrote:
> RTL8211F needs to enalbe TXDLY for RGMII during
> phy initialization, so move it to rtl8211f_config
> for early initialization.
>
> Signed-off-by: Shengzhou Liu 
> cc: Joe Hershberger 
> ---

Applied to u-boot-net/next, thanks!
-Joe
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


Re: [U-Boot] [PATCH v2] net/phy: refactor RTL8211F initialization

2015-04-27 Thread Joe Hershberger
On Fri, Apr 24, 2015 at 3:57 AM, Shengzhou Liu
 wrote:
> RTL8211F needs to enalbe TXDLY for RGMII during
> phy initialization, so move it to rtl8211f_config
> for early initialization.
>
> Signed-off-by: Shengzhou Liu 
> cc: Joe Hershberger 

Acked-by: Joe Hershberger 
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot


[U-Boot] [PATCH v2] net/phy: refactor RTL8211F initialization

2015-04-24 Thread Shengzhou Liu
RTL8211F needs to enalbe TXDLY for RGMII during
phy initialization, so move it to rtl8211f_config
for early initialization.

Signed-off-by: Shengzhou Liu 
cc: Joe Hershberger 
---
v2: add default page and use macro instead of magic number.

 drivers/net/phy/realtek.c | 33 +
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/drivers/net/phy/realtek.c b/drivers/net/phy/realtek.c
index 3917c82..7e1c316 100644
--- a/drivers/net/phy/realtek.c
+++ b/drivers/net/phy/realtek.c
@@ -32,6 +32,7 @@
 #define MIIM_RTL8211F_PHYSTAT_LINK 0x0004
 
 #define MIIM_RTL8211F_PAGE_SELECT  0x1f
+#define MIIM_RTL8211F_TX_DELAY 0x100
 
 /* RealTek RTL8211x */
 static int rtl8211x_config(struct phy_device *phydev)
@@ -43,6 +44,29 @@ static int rtl8211x_config(struct phy_device *phydev)
return 0;
 }
 
+static int rtl8211f_config(struct phy_device *phydev)
+{
+   u16 reg;
+
+   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);
+   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);
+   }
+
+   genphy_config_aneg(phydev);
+
+   return 0;
+}
+
 static int rtl8211x_parse_status(struct phy_device *phydev)
 {
unsigned int speed;
@@ -142,13 +166,6 @@ static int rtl8211f_parse_status(struct phy_device *phydev)
phydev->speed = SPEED_10;
}
 
-   if (phydev->interface == PHY_INTERFACE_MODE_RGMII) {
-   /* enable TXDLY */
-   phy_write(phydev, MDIO_DEVAD_NONE,
- MIIM_RTL8211F_PAGE_SELECT, 0xd08);
-   phy_write(phydev, MDIO_DEVAD_NONE, 0x11, 0x109);
-   }
-
return 0;
 }
 
@@ -209,7 +226,7 @@ static struct phy_driver RTL8211F_driver = {
.uid = 0x1cc916,
.mask = 0xff,
.features = PHY_GBIT_FEATURES,
-   .config = &rtl8211x_config,
+   .config = &rtl8211f_config,
.startup = &rtl8211f_startup,
.shutdown = &genphy_shutdown,
 };
-- 
2.1.0.27.g96db324

___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot