Commit 468ba54b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller
Browse files

fec: convert to gpio descriptor 



The driver can be trivially converted, as it only triggers the gpio
pin briefly to do a reset, and it already only supports DT.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 453d9fdc

drivers/net/ethernet/freescale/fec_main.c

+9 −16
Original line number Diff line number Diff line
@@ -56,12 +56,12 @@ 
#include <linux/fec.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>

#include <linux/of_mdio.h>

#include <linux/of_net.h>

#include <linux/regulator/consumer.h>

#include <linux/if_vlan.h>

#include <linux/pinctrl/consumer.h>

#include <linux/gpio/consumer.h>

#include <linux/prefetch.h>

#include <linux/mfd/syscon.h>

#include <linux/regmap.h>
@@ -4035,10 +4035,11 @@ static int fec_enet_init(struct net_device *ndev) 
#ifdef CONFIG_OF

static int fec_reset_phy(struct platform_device *pdev)

{

	int err, phy_reset;

	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;



	if (!np)

		return 0;
@@ -4048,12 +4049,6 @@ static int fec_reset_phy(struct platform_device *pdev) 
	if (!err && msec > 1000)

		msec = 1;



	phy_reset = of_get_named_gpio(np, "phy-reset-gpios", 0);

	if (phy_reset == -EPROBE_DEFER)

		return phy_reset;

	else if (!gpio_is_valid(phy_reset))

		return 0;



	err = of_property_read_u32(np, "phy-reset-post-delay", &phy_post_delay);

	/* valid reset duration should be less than 1s */

	if (!err && phy_post_delay > 1000)
@@ -4061,20 +4056,18 @@ static int fec_reset_phy(struct platform_device *pdev) 


	active_high = of_property_read_bool(np, "phy-reset-active-high");



	err = devm_gpio_request_one(&pdev->dev, phy_reset,

			active_high ? GPIOF_OUT_INIT_HIGH : GPIOF_OUT_INIT_LOW,

			"phy-reset");

	if (err) {

		dev_err(&pdev->dev, "failed to get phy-reset-gpios: %d\n", err);

		return err;

	}

	phy_reset = devm_gpiod_get(&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 (msec > 20)

		msleep(msec);

	else

		usleep_range(msec * 1000, msec * 1000 + 1000);



	gpio_set_value_cansleep(phy_reset, !active_high);

	gpiod_set_value_cansleep(phy_reset, !active_high);



	if (!phy_post_delay)

		return 0;