Skip to contentSkip to conversation

arm: socfpga: board: Repair Micrel PHY tuning

PATCH New Marek Vasut 1 participant 2 messages Dec 11, 2014 – Dec 16, 2014

lore
Share & tools
lore

Marek Vasut

author
#0 lore raw

PATCH 1/1 arm: socfpga: board: Repair Micrel PHY tuning

From: Pavel Machek <[email protected]>

Add proper error checking into the PHY tuning patch. Make the PHY tunning only happen in case the KSZ9021 PHY is enabled in config. Call the config callback after the tuning finished.

Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Tom Rini <[email protected]>
Cc Pavel Machek <[email protected]>
---
 board/altera/socfpga/socfpga_cyclone5.c | 34 +++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)
board/altera/socfpga/socfpga_cyclone5.c +28 -6
index 772a58e..459d82f 100644
@@ -46,19 +46,41 @@ int board_init(void)
 	return 0;
 }
 
+/*
+ * PHY configuration
+ */
+#ifdef CONFIG_PHY_MICREL_KSZ9021
 int board_phy_config(struct phy_device *phydev)
 {
+	int ret;
 	/*
 	 * These skew settings for the KSZ9021 ethernet phy is required for ethernet
 	 * to work reliably on most flavors of cyclone5 boards.
 	 */
-	ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_RX_DATA_SKEW,
-				   0x0);
-	ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_TX_DATA_SKEW,
-				   0x0);
-	ksz9021_phy_extended_write(phydev, MII_KSZ9021_EXT_RGMII_CLOCK_SKEW,
-				   0xf0f0);
+	ret = ksz9021_phy_extended_write(phydev,
+					 MII_KSZ9021_EXT_RGMII_RX_DATA_SKEW,
+					 0x0);
+	if (ret)
+		return ret;
+
+	ret = ksz9021_phy_extended_write(phydev,
+					 MII_KSZ9021_EXT_RGMII_TX_DATA_SKEW,
+					 0x0);
+	if (ret)
+		return ret;
+
+	ret = ksz9021_phy_extended_write(phydev,
+					 MII_KSZ9021_EXT_RGMII_CLOCK_SKEW,
+					 0xf0f0);
+	if (ret)
+		return ret;
+
+	if (phydev->drv->config)
+		return phydev->drv->config(phydev);
+
+	return 0;
 }
+#endif
 
 #ifdef CONFIG_USB_GADGET
 struct s3c_plat_otg_data socfpga_otg_data = {
Signature · 1 line
2.0.0
author Applied
#1 lore raw

PATCH 1/1 arm: socfpga: board: Repair Micrel PHY tuning

Quoted 11 lines · Marek Vasut

From: Pavel Machek <[email protected]>

Add proper error checking into the PHY tuning patch. Make the PHY tunning only happen in case the KSZ9021 PHY is enabled in config. Call the config callback after the tuning finished.

Signed-off-by Marek Vasut <[email protected]>
Cc Chin Liang See <[email protected]>
Cc Dinh Nguyen <[email protected]>
Cc Tom Rini <[email protected]>
Cc Pavel Machek <[email protected]>

Applied, thanks.

Best regards,
Marek Vasut