Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a0384c0 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

macb: fix PHY reset 



The driver calls gpiod_set_value() with GPIOD_OUT_* instead of 0 and 1, as
a result the PHY isn't really  put back into reset state in macb_remove().
Moreover, the driver assumes that something else has set the GPIO direction
to output, so if  it has not, the PHY may not be taken out of reset in
macb_probe() either...

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4cfc86f3

drivers/net/ethernet/cadence/macb.c

+2 −2
Original line number Diff line number Diff line
@@ -2959,7 +2959,7 @@ static int macb_probe(struct platform_device *pdev) 
		int gpio = of_get_named_gpio(phy_node, "reset-gpios", 0);

		if (gpio_is_valid(gpio))

			bp->reset_gpio = gpio_to_desc(gpio);

		gpiod_set_value(bp->reset_gpio, GPIOD_OUT_HIGH);

		gpiod_direction_output(bp->reset_gpio, 1);

	}

	of_node_put(phy_node);
@@ -3029,7 +3029,7 @@ static int macb_remove(struct platform_device *pdev) 
		mdiobus_free(bp->mii_bus);



		/* Shutdown the PHY if there is a GPIO reset */

		gpiod_set_value(bp->reset_gpio, GPIOD_OUT_LOW);

		gpiod_set_value(bp->reset_gpio, 0);



		unregister_netdev(dev);

		clk_disable_unprepare(bp->tx_clk);