From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: Wei Fang <wei.fang@nxp.com>, Jakub Kicinski <kuba@kernel.org>,
Andrew Lunn <andrew@lunn.ch>
Cc: Arnd Bergmann <arnd@arndb.de>,
Shenwei Wang <shenwei.wang@nxp.com>,
Clark Wang <xiaoning.wang@nxp.com>,
NXP Linux Team <linux-imx@nxp.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Paolo Abeni <pabeni@redhat.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 2/2] net: fec: do not double-parse 'phy-reset-active-high' property
Date: Wed, 1 Feb 2023 13:53:20 -0800 [thread overview]
Message-ID: <20230201215320.528319-2-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <20230201215320.528319-1-dmitry.torokhov@gmail.com>
Conversion to gpiod API done in commit 468ba54bd616 ("fec: convert
to gpio descriptor") clashed with gpiolib applying the same quirk to the
reset GPIO polarity (introduced in commit b02c85c9458c). This results in
the reset line being left active/device being left in reset state when
reset line is "active low".
Remove handling of 'phy-reset-active-high' property from the driver and
rely on gpiolib to apply needed adjustments to avoid ending up with the
double inversion/flipped logic.
Fixes: 468ba54bd616 ("fec: convert to gpio descriptor")
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
v3: new patch, split from the original one
drivers/net/ethernet/freescale/fec_main.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 00115b55d0ff..c73e25f8995e 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -4036,7 +4036,6 @@ static int fec_enet_init(struct net_device *ndev)
static int fec_reset_phy(struct platform_device *pdev)
{
struct gpio_desc *phy_reset;
- bool active_high = false;
int msec = 1, phy_post_delay = 0;
struct device_node *np = pdev->dev.of_node;
int err;
@@ -4054,10 +4053,8 @@ static int fec_reset_phy(struct platform_device *pdev)
if (!err && phy_post_delay > 1000)
return -EINVAL;
- active_high = of_property_read_bool(np, "phy-reset-active-high");
-
phy_reset = devm_gpiod_get_optional(&pdev->dev, "phy-reset",
- active_high ? GPIOD_OUT_HIGH : GPIOD_OUT_LOW);
+ GPIOD_OUT_HIGH);
if (IS_ERR(phy_reset))
return dev_err_probe(&pdev->dev, PTR_ERR(phy_reset),
"failed to get phy-reset-gpios\n");
@@ -4070,7 +4067,7 @@ static int fec_reset_phy(struct platform_device *pdev)
else
usleep_range(msec * 1000, msec * 1000 + 1000);
- gpiod_set_value_cansleep(phy_reset, !active_high);
+ gpiod_set_value_cansleep(phy_reset, 0);
if (!phy_post_delay)
return 0;
--
2.39.1.456.gfc5497dd1b-goog
next prev parent reply other threads:[~2023-02-01 21:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-01 21:53 [PATCH v3 1/2] net: fec: restore handling of PHY reset line as optional Dmitry Torokhov
2023-02-01 21:53 ` Dmitry Torokhov [this message]
2023-02-01 22:54 ` [PATCH v3 2/2] net: fec: do not double-parse 'phy-reset-active-high' property Andrew Lunn
2023-02-01 23:21 ` Dmitry Torokhov
2023-02-02 1:08 ` Dmitry Torokhov
2023-02-02 13:21 ` Andrew Lunn
2023-02-01 21:58 ` [PATCH v3 1/2] net: fec: restore handling of PHY reset line as optional Andrew Lunn
2023-02-02 9:45 ` Marc Kleine-Budde
2023-02-02 9:47 ` Arnd Bergmann
2023-02-03 5:30 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230201215320.528319-2-dmitry.torokhov@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=andrew@lunn.ch \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shenwei.wang@nxp.com \
--cc=wei.fang@nxp.com \
--cc=xiaoning.wang@nxp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).