[PATCH v3 11/22] net: phy: fixed: Support the old DT binding

Bin Meng bmeng.cn at gmail.com
Sun Mar 14 06:14:59 CET 2021


Update fixedphy_probe() to support the old DT binding.

Signed-off-by: Bin Meng <bmeng.cn at gmail.com>
Reviewed-by: Ramon Fried <rfried.dev at gmail.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean at nxp.com>

---

Changes in v3:
- sort variable definitions by line length

 drivers/net/phy/fixed.c | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 304e506554..1192915ee5 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -27,6 +27,8 @@ static int fixedphy_config(struct phy_device *phydev)
 {
 	ofnode node = phy_get_ofnode(phydev);
 	struct fixed_link *priv;
+	bool old_binding = false;
+	u32 old_val[5];
 	u32 val;
 
 	if (!ofnode_valid(node))
@@ -34,6 +36,18 @@ static int fixedphy_config(struct phy_device *phydev)
 
 	/* check for mandatory properties within fixed-link node */
 	val = ofnode_read_u32_default(node, "speed", 0);
+
+	if (!val) {
+		/* try old binding */
+		old_binding = true;
+		if (ofnode_read_u32_array(node, "fixed-link", old_val,
+					  ARRAY_SIZE(old_val))) {
+			printf("ERROR: no/invalid <fixed-link> property!\n");
+			return -ENOENT;
+		}
+		val = old_val[2];
+	}
+
 	if (val != SPEED_10 && val != SPEED_100 && val != SPEED_1000 &&
 	    val != SPEED_2500 && val != SPEED_10000) {
 		printf("ERROR: no/invalid speed given in fixed-link node!\n");
@@ -48,9 +62,15 @@ static int fixedphy_config(struct phy_device *phydev)
 	phydev->priv = priv;
 
 	priv->link_speed = val;
-	priv->duplex = ofnode_read_bool(node, "full-duplex");
-	priv->pause = ofnode_read_bool(node, "pause");
-	priv->asym_pause = ofnode_read_bool(node, "asym-pause");
+	if (!old_binding) {
+		priv->duplex = ofnode_read_bool(node, "full-duplex");
+		priv->pause = ofnode_read_bool(node, "pause");
+		priv->asym_pause = ofnode_read_bool(node, "asym-pause");
+	} else {
+		priv->duplex = old_val[1];
+		priv->pause = old_val[3];
+		priv->asym_pause = old_val[4];
+	}
 
 	return 0;
 }
-- 
2.25.1



More information about the U-Boot mailing list