diff mbox

net: fec: Add "phy-reset-active-low" property to DT

Message ID 1454962873-1941-1-git-send-email-bernhard@bwalle.de
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Bernhard Walle Feb. 8, 2016, 8:21 p.m. UTC
We need that for a custom hardware that needs the reverse reset
sequence.

Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
 Documentation/devicetree/bindings/net/fsl-fec.txt | 3 +++
 drivers/net/ethernet/freescale/fec_main.c         | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

Comments

Arnd Bergmann Feb. 8, 2016, 9:46 p.m. UTC | #1
On Monday 08 February 2016 21:21:13 Bernhard Walle wrote:
> We need that for a custom hardware that needs the reverse reset
> sequence.
> 
> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> 

Why can't this be specified in the gpios property?

	Arnd
Andrew Lunn Feb. 8, 2016, 9:48 p.m. UTC | #2
On Mon, Feb 08, 2016 at 09:21:13PM +0100, Bernhard Walle wrote:
> We need that for a custom hardware that needs the reverse reset
> sequence.
> 
> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> ---
>  Documentation/devicetree/bindings/net/fsl-fec.txt | 3 +++
>  drivers/net/ethernet/freescale/fec_main.c         | 8 ++++++--
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/net/fsl-fec.txt b/Documentation/devicetree/bindings/net/fsl-fec.txt
> index a9eb611..a4799ff 100644
> --- a/Documentation/devicetree/bindings/net/fsl-fec.txt
> +++ b/Documentation/devicetree/bindings/net/fsl-fec.txt
> @@ -12,6 +12,9 @@ Optional properties:
>    only if property "phy-reset-gpios" is available.  Missing the property
>    will have the duration be 1 millisecond.  Numbers greater than 1000 are
>    invalid and 1 millisecond will be used instead.
> +- phy-reset-active-low : If present then the reset sequence using the GPIO
> +  specified in the "phy-reset-gpios" property is reversed (H=reset state,
> +  L=operation state).

Hi Bernhard

Maybe at the same time add a comment to phy-reset-gpios that the flags
part is ignored, see the none standard phy-reset-active-low property
instead.

	Andrew
Andrew Lunn Feb. 8, 2016, 9:51 p.m. UTC | #3
On Mon, Feb 08, 2016 at 10:46:42PM +0100, Arnd Bergmann wrote:
> On Monday 08 February 2016 21:21:13 Bernhard Walle wrote:
> > We need that for a custom hardware that needs the reverse reset
> > sequence.
> > 
> > Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> > 
> 
> Why can't this be specified in the gpios property?

Backwards compatibility. The flag has always been ignored until now,
yet various DTs have a flag value which are active low. If suddenly it
worked, various boards would break :-(

       Andrew
Arnd Bergmann Feb. 9, 2016, 2:47 p.m. UTC | #4
On Monday 08 February 2016 22:51:38 Andrew Lunn wrote:
> On Mon, Feb 08, 2016 at 10:46:42PM +0100, Arnd Bergmann wrote:
> > On Monday 08 February 2016 21:21:13 Bernhard Walle wrote:
> > > We need that for a custom hardware that needs the reverse reset
> > > sequence.
> > > 
> > > Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
> > > 
> > 
> > Why can't this be specified in the gpios property?
> 
> Backwards compatibility. The flag has always been ignored until now,
> yet various DTs have a flag value which are active low. If suddenly it
> worked, various boards would break 

Ok, I see. 

	Arnd
David Miller Feb. 16, 2016, 8:17 p.m. UTC | #5
From: Bernhard Walle <bernhard@bwalle.de>
Date: Mon,  8 Feb 2016 21:21:13 +0100

> We need that for a custom hardware that needs the reverse reset
> sequence.
> 
> Signed-off-by: Bernhard Walle <bernhard@bwalle.de>

Applied to net-next, thanks.
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/net/fsl-fec.txt b/Documentation/devicetree/bindings/net/fsl-fec.txt
index a9eb611..a4799ff 100644
--- a/Documentation/devicetree/bindings/net/fsl-fec.txt
+++ b/Documentation/devicetree/bindings/net/fsl-fec.txt
@@ -12,6 +12,9 @@  Optional properties:
   only if property "phy-reset-gpios" is available.  Missing the property
   will have the duration be 1 millisecond.  Numbers greater than 1000 are
   invalid and 1 millisecond will be used instead.
+- phy-reset-active-low : If present then the reset sequence using the GPIO
+  specified in the "phy-reset-gpios" property is reversed (H=reset state,
+  L=operation state).
 - phy-supply : regulator that powers the Ethernet PHY.
 - phy-handle : phandle to the PHY device connected to this device.
 - fixed-link : Assume a fixed link. See fixed-link.txt in the same directory.
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 41c81f6..98caf87 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -3229,6 +3229,7 @@  static int fec_enet_init(struct net_device *ndev)
 static void fec_reset_phy(struct platform_device *pdev)
 {
 	int err, phy_reset;
+	bool active_low = false;
 	int msec = 1;
 	struct device_node *np = pdev->dev.of_node;
 
@@ -3244,14 +3245,17 @@  static void fec_reset_phy(struct platform_device *pdev)
 	if (!gpio_is_valid(phy_reset))
 		return;
 
+	active_low = of_property_read_bool(np, "phy-reset-active-low");
+
 	err = devm_gpio_request_one(&pdev->dev, phy_reset,
-				    GPIOF_OUT_INIT_LOW, "phy-reset");
+			active_low ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,
+			"phy-reset");
 	if (err) {
 		dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err);
 		return;
 	}
 	msleep(msec);
-	gpio_set_value_cansleep(phy_reset, 1);
+	gpio_set_value_cansleep(phy_reset, !active_low);
 }
 #else /* CONFIG_OF */
 static void fec_reset_phy(struct platform_device *pdev)