diff options
author | Sebastian Frias <sf84@laposte.net> | 2016-03-23 06:49:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-03-23 13:39:25 -0400 |
commit | 9eb13f65c305ec6687d7666abce14e6c047fa872 (patch) | |
tree | 1c81642169cd379ad3362620db7eff2fc67188e0 /drivers/net/phy | |
parent | d57019d1858a6f9b3ca05d76d793466ae428cfa3 (diff) |
net: phy: at803x: Request 'reset' GPIO only for AT8030 PHY
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@laposte.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r-- | drivers/net/phy/at803x.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index d7f03fa4ba8f..b3ffaee30858 100644 --- a/drivers/net/phy/at803x.c +++ b/drivers/net/phy/at803x.c | |||
@@ -277,12 +277,16 @@ static int at803x_probe(struct phy_device *phydev) | |||
277 | if (!priv) | 277 | if (!priv) |
278 | return -ENOMEM; | 278 | return -ENOMEM; |
279 | 279 | ||
280 | if (phydev->drv->phy_id != ATH8030_PHY_ID) | ||
281 | goto does_not_require_reset_workaround; | ||
282 | |||
280 | gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); | 283 | gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); |
281 | if (IS_ERR(gpiod_reset)) | 284 | if (IS_ERR(gpiod_reset)) |
282 | return PTR_ERR(gpiod_reset); | 285 | return PTR_ERR(gpiod_reset); |
283 | 286 | ||
284 | priv->gpiod_reset = gpiod_reset; | 287 | priv->gpiod_reset = gpiod_reset; |
285 | 288 | ||
289 | does_not_require_reset_workaround: | ||
286 | phydev->priv = priv; | 290 | phydev->priv = priv; |
287 | 291 | ||
288 | return 0; | 292 | return 0; |