diff mbox series

[v2,12/21] net: phy: fixed: Support the old DT binding

Message ID 20210312133602.31105-13-bmeng.cn@gmail.com
State Superseded
Delegated to: Priyanka Jain
Headers show
Series ppc: qemu: Add eTSEC support | expand

Commit Message

Bin Meng March 12, 2021, 1:35 p.m. UTC 
Update fixedphy_probe() to support the old DT binding.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
---

(no changes since v1)

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

Comments

Vladimir Oltean March 13, 2021, 1:19 p.m. UTC | #1 
On Fri, Mar 12, 2021 at 09:35:53PM +0800, Bin Meng wrote:
> Update fixedphy_probe() to support the old DT binding.
> 
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> Reviewed-by: Ramon Fried <rfried.dev@gmail.com>
> ---
> 
> (no changes since v1)
> 
>  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..ea05a45244 100644
> --- a/drivers/net/phy/fixed.c
> +++ b/drivers/net/phy/fixed.c
> @@ -27,13 +27,27 @@ static int fixedphy_config(struct phy_device *phydev)
>  {
>  	ofnode node = phy_get_ofnode(phydev);
>  	struct fixed_link *priv;
> +	bool old_binding = false;
>  	u32 val;
> +	u32 old_val[5];

Perhaps a pet peeve from Linux networking, but could you please keep the
variable definitions sorted by line length? Thanks.

Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
diff mbox series

Patch

diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index 304e506554..ea05a45244 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -27,13 +27,27 @@  static int fixedphy_config(struct phy_device *phydev)
 {
 	ofnode node = phy_get_ofnode(phydev);
 	struct fixed_link *priv;
+	bool old_binding = false;
 	u32 val;
+	u32 old_val[5];
 
 	if (!ofnode_valid(node))
 		return -EINVAL;
 
 	/* 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;
 }