Commit 54e2a392 authored by Sebastian Frias's avatar Sebastian Frias Committed by Kamal Mostafa

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

commit 9eb13f65 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 13a56b44 ("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: 13a56b44 ("net: phy: at803x: Add support for hardware reset")
Signed-off-by: default avatarSebastian Frias <sf84@laposte.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
parent d3d51b6a
...@@ -197,12 +197,16 @@ static int at803x_probe(struct phy_device *phydev) ...@@ -197,12 +197,16 @@ static int at803x_probe(struct phy_device *phydev)
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
if (phydev->drv->phy_id != ATH8030_PHY_ID)
goto does_not_require_reset_workaround;
priv->gpiod_reset = devm_gpiod_get(dev, "reset"); priv->gpiod_reset = devm_gpiod_get(dev, "reset");
if (IS_ERR(priv->gpiod_reset)) if (IS_ERR(priv->gpiod_reset))
priv->gpiod_reset = NULL; priv->gpiod_reset = NULL;
else else
gpiod_direction_output(priv->gpiod_reset, 1); gpiod_direction_output(priv->gpiod_reset, 1);
does_not_require_reset_workaround:
phydev->priv = priv; phydev->priv = priv;
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment