74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
42 lines
1.3 KiB
Diff
42 lines
1.3 KiB
Diff
From: Sebastian Frias <sf84@laposte.net>
|
|
Date: Wed, 23 Mar 2016 11:49:09 +0100
|
|
Subject: [PATCH] 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>
|
|
---
|
|
|
|
--- a/drivers/net/phy/at803x.c
|
|
+++ b/drivers/net/phy/at803x.c
|
|
@@ -250,12 +250,16 @@ static int at803x_probe(struct phy_devic
|
|
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;
|