Skip to contentSkip to conversation

net: phy: dp83867: Add binding for the CLK_OUT pin muxing option

PATCH Applied Daniel Schultz 4 participants 7 messages Feb 14, 2018

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 net: phy: dp83867: Add binding for the CLK_OUT pin muxing option

From: Wadim Egorov <[email protected]>

The DP83867 has a muxing option for the CLK_OUT pin. It is possible to set CLK_OUT for different channels.
Create a binding to select a specific clock for CLK_OUT pin.

---
Changes:

	v2:
	  Added check if clk_output_sel has a valid value
	  Only write the clock ouput register if a musing is desired
	v3:
	  -
 drivers/net/phy/dp83867.c            | 19 +++++++++++++++++++
 include/dt-bindings/net/ti-dp83867.h | 14 ++++++++++++++
 2 files changed, 33 insertions(+)
drivers/net/phy/dp83867.c +19 -0
index c1ab976..a862194 100644
@@ -75,6 +75,8 @@
 
 #define DP83867_IO_MUX_CFG_IO_IMPEDANCE_MAX	0x0
 #define DP83867_IO_MUX_CFG_IO_IMPEDANCE_MIN	0x1f
+#define DP83867_IO_MUX_CFG_CLK_O_SEL_MASK	(0x1f << 8)
+#define DP83867_IO_MUX_CFG_CLK_O_SEL_SHIFT	8
 
 /* CFG4 bits */
 #define DP83867_CFG4_PORT_MIRROR_EN              BIT(0)
@@ -92,6 +94,7 @@ struct dp83867_private {
 	int io_impedance;
 	int port_mirroring;
 	bool rxctrl_strap_quirk;
+	int clk_output_sel;
 };
 
 static int dp83867_ack_interrupt(struct phy_device *phydev)
@@ -160,6 +163,14 @@ static int dp83867_of_init(struct phy_device *phydev)
 	dp83867->io_impedance = -EINVAL;
 
 	/* Optional configuration */
+	ret = of_property_read_u32(of_node, "ti,clk-output-sel",
+				   &dp83867->clk_output_sel);
+	if (ret || dp83867->clk_output_sel > DP83867_CLK_O_SEL_REF_CLK)
+		/* Keep the default value if ti,clk-output-sel is not set
+		 * or too high
+		 */
+		dp83867->clk_output_sel = DP83867_CLK_O_SEL_REF_CLK;
+
 	if (of_property_read_bool(of_node, "ti,max-output-impedance"))
 		dp83867->io_impedance = DP83867_IO_MUX_CFG_IO_IMPEDANCE_MAX;
 	else if (of_property_read_bool(of_node, "ti,min-output-impedance"))
@@ -295,6 +306,14 @@ static int dp83867_config_init(struct phy_device *phydev)
 	if (dp83867->port_mirroring != DP83867_PORT_MIRROING_KEEP)
 		dp83867_config_port_mirroring(phydev);
 
+	/* Clock output selection if muxing property is set */
+	if (dp83867->clk_output_sel != DP83867_CLK_O_SEL_REF_CLK) {
+		val = phy_read_mmd(phydev, DP83867_DEVADDR, DP83867_IO_MUX_CFG);
+		val &= ~DP83867_IO_MUX_CFG_CLK_O_SEL_MASK;
+		val |= (dp83867->clk_output_sel << DP83867_IO_MUX_CFG_CLK_O_SEL_SHIFT);
+		phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_IO_MUX_CFG, val);
+	}
+
 	return 0;
 }
 
include/dt-bindings/net/ti-dp83867.h +14 -0
index 172744a..7b16564 100644
@@ -42,4 +42,18 @@
 #define	DP83867_RGMIIDCTL_3_75_NS	0xe
 #define	DP83867_RGMIIDCTL_4_00_NS	0xf
 
+/* IO_MUX_CFG - Clock output selection */
+#define DP83867_CLK_O_SEL_CHN_A_RCLK		0x0
+#define DP83867_CLK_O_SEL_CHN_B_RCLK		0x1
+#define DP83867_CLK_O_SEL_CHN_C_RCLK		0x2
+#define DP83867_CLK_O_SEL_CHN_D_RCLK		0x3
+#define DP83867_CLK_O_SEL_CHN_A_RCLK_DIV5	0x4
+#define DP83867_CLK_O_SEL_CHN_B_RCLK_DIV5	0x5
+#define DP83867_CLK_O_SEL_CHN_C_RCLK_DIV5	0x6
+#define DP83867_CLK_O_SEL_CHN_D_RCLK_DIV5	0x7
+#define DP83867_CLK_O_SEL_CHN_A_TCLK		0x8
+#define DP83867_CLK_O_SEL_CHN_B_TCLK		0x9
+#define DP83867_CLK_O_SEL_CHN_C_TCLK		0xA
+#define DP83867_CLK_O_SEL_CHN_D_TCLK		0xB
+#define DP83867_CLK_O_SEL_REF_CLK		0xC
 #endif
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 2/2 net: phy: dp83867: Add documentation for CLK_OUT pin muxing

From: Wadim Egorov <[email protected]>

Add documentation of ti,clk-output-sel which can be used to select a specific clock for CLK_OUT.

---
Changes:

	v2:
	  -
	v3:
	  Fixed indentation.
 Documentation/devicetree/bindings/net/ti,dp83867.txt | 2 ++
 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/net/ti,dp83867.txt +2 -0
index 02c4353..9ef9338 100644
@@ -25,6 +25,8 @@ Optional property:
 				    software needs to take when this pin is
 				    strapped in these modes. See data manual
 				    for details.
+	- ti,clk-output-sel - Muxing option for CLK_OUT pin - see dt-bindings/net/ti-dp83867.h
+				    for applicable values.
 
 Note: ti,min-output-impedance and ti,max-output-impedance are mutually
       exclusive. When both properties are present ti,max-output-impedance
Signature · 1 line
2.7.4
Reviewed-by on v3 2/2
#2 lore raw

Re: [PATCH v3 2/2] net: phy: dp83867: Add documentation for CLK_OUT pin muxing

Quoted 7 lines · Daniel Schultz

From: Wadim Egorov <[email protected]>

Add documentation of ti,clk-output-sel which can be used to select a specific clock for CLK_OUT.

Nit: usually the binding patch comes first and the implementation using it right after, not necessary to respin.

Signature · 5 lines
Florian
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
maintainer
#3 lore raw

Re: [PATCH v3 2/2] net: phy: dp83867: Add documentation for CLK_OUT pin muxing

In reply to Daniel Schultz

From: Daniel Schultz <[email protected]>
Date: Wed, 14 Feb 2018 17:07:12 +0100

Quoted 5 lines

From: Wadim Egorov <[email protected]>

Add documentation of ti,clk-output-sel which can be used to select a specific clock for CLK_OUT.

Quoted 8 lines

---
Changes:

	v2:
	  -
	v3:
	  Fixed indentation.

Also applied to net-next, thanks.

maintainer Reviewed-by on v3 1/2
#4 lore raw
In reply to Daniel Schultz
Quoted 8 lines · Daniel Schultz

From: Wadim Egorov <w.egorov-guT5V/[email protected]>

The DP83867 has a muxing option for the CLK_OUT pin. It is possible to set CLK_OUT for different channels.
Create a binding to select a specific clock for CLK_OUT pin.

Andrew
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Reviewed-by on v3 1/2
#5 lore raw
In reply to Daniel Schultz
Quoted 25 lines · Daniel Schultz

From: Wadim Egorov <[email protected]>

The DP83867 has a muxing option for the CLK_OUT pin. It is possible to set CLK_OUT for different channels.
Create a binding to select a specific clock for CLK_OUT pin.

---
Changes:

	v2:
	  Added check if clk_output_sel has a valid value
	  Only write the clock ouput register if a musing is desired
	v3:
	  -

drivers/net/phy/dp83867.c | 19 +++++++++++++++++++
include/dt-bindings/net/ti-dp83867.h | 14 ++++++++++++++

2 files changed, 33 insertions(+)
drivers/net/phy/dp83867.c +0 -0
index c1ab976..a862194 100644

drivers/net/phy/dp83867.c line 80

Quoted 6 lines
drivers/net/phy/dp83867.c +2 -0
@@ -75,6 +75,8 @@
 
 #define DP83867_IO_MUX_CFG_IO_IMPEDANCE_MAX	0x0
 #define DP83867_IO_MUX_CFG_IO_IMPEDANCE_MIN	0x1f
+#define DP83867_IO_MUX_CFG_CLK_O_SEL_MASK	(0x1f << 8)
+#define DP83867_IO_MUX_CFG_CLK_O_SEL_SHIFT	8
 

Nit: it looks like you could use the shift constant you define for defining the mask as well.

Other than that:

Signature · 5 lines
Florian
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
maintainer Applied
#6 lore raw
In reply to Daniel Schultz

From: Daniel Schultz <[email protected]>
Date: Wed, 14 Feb 2018 17:07:11 +0100

Quoted 8 lines

From: Wadim Egorov <[email protected]>

The DP83867 has a muxing option for the CLK_OUT pin. It is possible to set CLK_OUT for different channels.
Create a binding to select a specific clock for CLK_OUT pin.

Quoted 7 lines

---
Changes:

	v2:
	  Added check if clk_output_sel has a valid value
	  Only write the clock ouput register if a musing is desired
	v3:
	  -

Applied to net-next.