Skip to contentSkip to conversation

fec: Do not assume that PHY reset is active low

PATCH In review Fabio Estevam 1 participant 2 messages Dec 24, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 fec: Do not assume that PHY reset is active low

From: Fabio Estevam <[email protected]>

We should not assume that the PHY reset is always active low.

Retrieve this information from the device tree instead, so that the PHY reset can work on both cases.

---
Changes since v1:
- Fix the initial state of the GPIOs

 drivers/net/ethernet/freescale/fec_main.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/net/ethernet/freescale/fec_main.c +10 -4
index 6530177..4b9976a0 100644
@@ -2053,6 +2053,8 @@ static void fec_reset_phy(struct platform_device *pdev)
 	int err, phy_reset;
 	int msec = 1;
 	struct device_node *np = pdev->dev.of_node;
+	enum of_gpio_flags flags;
+	bool port;
 
 	if (!np)
 		return;
@@ -2062,18 +2064,22 @@ static void fec_reset_phy(struct platform_device *pdev)
 	if (msec > 1000)
 		msec = 1;
 
-	phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);
+	phy_reset = of_get_named_gpio_flags(np, "phy-reset-gpios", 0, &flags);
 	if (!gpio_is_valid(phy_reset))
 		return;
 
-	err = devm_gpio_request_one(&pdev->dev, phy_reset,
-				    GPIOF_OUT_INIT_LOW, "phy-reset");
+	if (flags & OF_GPIO_ACTIVE_LOW)
+		port = GPIOF_OUT_INIT_HIGH;
+	else
+		port = GPIOF_OUT_INIT_LOW;
+
+	err = devm_gpio_request_one(&pdev->dev, phy_reset, port, "phy-reset");
 	if (err) {
 		dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err);
 		return;
 	}
 	msleep(msec);
-	gpio_set_value(phy_reset, 1);
+	gpio_set_value(phy_reset, !port);
 }
 #else /* CONFIG_OF */
 static void fec_reset_phy(struct platform_device *pdev)
Signature · 1 line
1.8.1.2
#1 lore raw
Quoted 4 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

We should not assume that the PHY reset is always active low.

Quoted 8 lines

Retrieve this information from the device tree instead, so that the PHY reset can work on both cases.

---
Changes since v1:
- Fix the initial state of the GPIOs

Sorry, v1 was the correct one. Please discard v2.