]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
net: phy: at803x: Request 'reset' GPIO only for AT8030 PHY
authorSebastian Frias <sf84@laposte.net>
Wed, 23 Mar 2016 10:49:09 +0000 (11:49 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 23 Mar 2016 17:39:25 +0000 (13:39 -0400)
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>
drivers/net/phy/at803x.c

index d7f03fa4ba8f88f7955ec38873704cb38d7d2bd4..b3ffaee3085885e02a2556f5d34517320a875f1b 100644 (file)
@@ -277,12 +277,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;
+
        gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
        if (IS_ERR(gpiod_reset))
                return PTR_ERR(gpiod_reset);
 
        priv->gpiod_reset = gpiod_reset;
 
+does_not_require_reset_workaround:
        phydev->priv = priv;
 
        return 0;