iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: fec: do not double-parse 'phy-reset-active-high' property

Browse Source 
Conversion to gpiod API done in commit 468ba54bd6 ("fec: convert
to gpio descriptor") clashed with gpiolib applying the same quirk to the
reset GPIO polarity (introduced in commit b02c85c945). 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: 468ba54bd6 ("fec: convert to gpio descriptor")
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20230201215320.528319-2-dmitry.torokhov@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Dmitry Torokhov
2023-02-01 13:53:20 -08:00
committed by Jakub Kicinski
parent d7b5e5dd66
commit 0719bc3a5c
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/ethernet/freescale/fec_main.c
View File

@@ -4036,7 +4036,6 @@ free_queue_mem:
static int fec_reset_phy(struct platform_device *pdev) static int fec_reset_phy(struct platform_device *pdev)
{ {
struct gpio_desc *phy_reset; struct gpio_desc *phy_reset;
bool active_high = false;
int msec = 1, phy_post_delay = 0; int msec = 1, phy_post_delay = 0;
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
int err; int err;
@@ -4054,10 +4053,8 @@ static int fec_reset_phy(struct platform_device *pdev)
if (!err && phy_post_delay > 1000) if (!err && phy_post_delay > 1000)
return -EINVAL; return -EINVAL;
active_high = of_property_read_bool(np, "phy-reset-active-high");
phy_reset = devm_gpiod_get_optional(&pdev->dev, "phy-reset", 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)) if (IS_ERR(phy_reset))
return dev_err_probe(&pdev->dev, PTR_ERR(phy_reset), return dev_err_probe(&pdev->dev, PTR_ERR(phy_reset),
"failed to get phy-reset-gpios\n"); "failed to get phy-reset-gpios\n");
@@ -4070,7 +4067,7 @@ static int fec_reset_phy(struct platform_device *pdev)
else else
usleep_range(msec * 1000, msec * 1000 + 1000); 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) if (!phy_post_delay)
return 0; return 0;