[U-Boot] [PATCH] net: phy: ti: Fix clock output DT property

Trent Piepho tpiepho at impinj.com
Fri May 10 17:49:08 UTC 2019


The code block reading the DT property for the clock output control was
before the phy's DT node pointer was set, so it could never work.  Move
it after the node pointer is set.

Also store the unsigned 32-bit property into an unsigned value, not a
signed value, as the former will cause a problem if value overflows.
For instance, if one were to add 0xffffffff as a code to mean the clock
output should be turned off.

Cc: Joe Hershberger <joe.hershberger at ni.com>
Cc: Janine Hagemann <j.hagemann at phytec.de>
Cc: Grygorii Strashko <grygorii.strashko at ti.com>
Signed-off-by: Trent Piepho <tpiepho at impinj.com>
---
 drivers/net/phy/ti.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/net/phy/ti.c b/drivers/net/phy/ti.c
index 33f5687e0e..1aee338ec4 100644
--- a/drivers/net/phy/ti.c
+++ b/drivers/net/phy/ti.c
@@ -113,7 +113,7 @@ struct dp83867_private {
 	int io_impedance;
 	bool rxctrl_strap_quirk;
 	int port_mirroring;
-	int clk_output_sel;
+	unsigned int clk_output_sel;
 };
 
 /**
@@ -214,21 +214,15 @@ static int dp83867_of_init(struct phy_device *phydev)
 	ofnode node;
 	u16 val;
 
-	/* Optional configuration */
-
-	/*
-	 * Keep the default value if ti,clk-output-sel is not set
-	 * or to high
-	 */
+	node = phy_get_ofnode(phydev);
+	if (!ofnode_valid(node))
+		return -EINVAL;
 
+	/* Keep the default value if ti,clk-output-sel is not set */
 	dp83867->clk_output_sel =
 		ofnode_read_u32_default(node, "ti,clk-output-sel",
 					DP83867_CLK_O_SEL_REF_CLK);
 
-	node = phy_get_ofnode(phydev);
-	if (!ofnode_valid(node))
-		return -EINVAL;
-
 	if (ofnode_read_bool(node, "ti,max-output-impedance"))
 		dp83867->io_impedance = DP83867_IO_MUX_CFG_IO_IMPEDANCE_MAX;
 	else if (ofnode_read_bool(node, "ti,min-output-impedance"))
-- 
2.14.5



More information about the U-Boot mailing list