[3.16.y-ckt stable] Patch "net: phy: at803x: Request 'reset' GPIO only for AT8030 PHY" has been added to the 3.16.y-ckt tree

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    net: phy: at803x: Request 'reset' GPIO only for AT8030 PHY

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:

    http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue

This patch is scheduled to be released in version 3.16.7-ckt27.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

---8<------------------------------------------------------------

>From b94dc6f758a880f81db4a2ccfc3c6e4cf35bb3d3 Mon Sep 17 00:00:00 2001
From: Sebastian Frias <sf84 at laposte.net>
Date: Wed, 23 Mar 2016 11:49:09 +0100
Subject: net: phy: at803x: Request 'reset' GPIO only for AT8030 PHY

commit 9eb13f65c305ec6687d7666abce14e6c047fa872 upstream.

This removes the dependency on GPIOLIB for non faulty PHYs.

Indeed, without this patch, if GPIOLIB is not selected
devm_gpiod_get_optional() will return -ENOSYS and the driver probe
call will fail, regardless of the actual PHY hardware.

Out of the 3 PHYs supported by this driver (AT8030, AT8031, AT8035),
only AT8030 presents the issues that commit 13a56b449325 ("net: phy:
at803x: Add support for hardware reset") attempts to work-around by
using a 'reset' GPIO line.

Hence, only AT8030 should depend on GPIOLIB operating properly.

Fixes: 13a56b449325 ("net: phy: at803x: Add support for hardware reset")

Signed-off-by: Sebastian Frias <sf84 at laposte.net>
Signed-off-by: David S. Miller <davem at davemloft.net>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/net/phy/at803x.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index fdc1b418fa6a..28f484f8d530 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -197,12 +197,16 @@ static int at803x_probe(struct phy_device *phydev)
 	if (!priv)
 		return -ENOMEM;

+	if (phydev->drv->phy_id != ATH8030_PHY_ID)
+		goto does_not_require_reset_workaround;
+
 	priv->gpiod_reset = devm_gpiod_get(dev, "reset");
 	if (IS_ERR(priv->gpiod_reset))
 		priv->gpiod_reset = NULL;
 	else
 		gpiod_direction_output(priv->gpiod_reset, 1);

+does_not_require_reset_workaround:
 	phydev->priv = priv;

 	return 0;