[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230201215320.528319-1-dmitry.torokhov@gmail.com>
Date: Wed, 1 Feb 2023 13:53:19 -0800
From: Dmitry Torokhov <dmitry.torokhov@...il.com>
To: Wei Fang <wei.fang@....com>, Jakub Kicinski <kuba@...nel.org>,
Andrew Lunn <andrew@...n.ch>
Cc: Arnd Bergmann <arnd@...db.de>, Shenwei Wang <shenwei.wang@....com>,
Clark Wang <xiaoning.wang@....com>,
NXP Linux Team <linux-imx@....com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Paolo Abeni <pabeni@...hat.com>,
Marc Kleine-Budde <mkl@...gutronix.de>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH v3 1/2] net: fec: restore handling of PHY reset line as optional
Conversion of the driver to gpiod API done in 468ba54bd616 ("fec:
convert to gpio descriptor") incorrectly made reset line mandatory and
resulted in aborting driver probe in cases where reset line was not
specified (note: this way of specifying PHY reset line is actually
deprecated).
Switch to using devm_gpiod_get_optional() and skip manipulating reset
line if it can not be located.
Fixes: 468ba54bd616 ("fec: convert to gpio descriptor")
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@...il.com>
---
v3: removed handling of 'phy-reset-active-high', it was moved to patch #2
v2: dropped conversion to generic device properties from the patch
drivers/net/ethernet/freescale/fec_main.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 2716898e0b9b..00115b55d0ff 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -4056,12 +4056,15 @@ static int fec_reset_phy(struct platform_device *pdev)
active_high = of_property_read_bool(np, "phy-reset-active-high");
- phy_reset = devm_gpiod_get(&pdev->dev, "phy-reset",
+ phy_reset = devm_gpiod_get_optional(&pdev->dev, "phy-reset",
active_high ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW);
if (IS_ERR(phy_reset))
return dev_err_probe(&pdev->dev, PTR_ERR(phy_reset),
"failed to get phy-reset-gpios\n");
+ if (!phy_reset)
+ return 0;
+
if (msec > 20)
msleep(msec);
else
--
2.39.1.456.gfc5497dd1b-goog
Powered by blists - more mailing lists