Commit 7c86f20d authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by David S. Miller
Browse files

net: stmmac: use GPIO descriptors in stmmac_mdio_reset 



Switch stmmac_mdio_reset to use GPIO descriptors. GPIO core handles the
"snps,reset-gpio" for GPIO descriptors so we don't need to take care of
it inside the driver anymore.

The advantage of this is that we now preserve the GPIO flags which are
passed via devicetree. This is required on some newer Amlogic boards
which use an Open Drain pin for the reset GPIO. This pin can only output
a LOW signal or switch to input mode but it cannot output a HIGH signal.
There are already devicetree bindings for these special cases and GPIO
core already takes care of them but only if we use GPIO descriptors
instead of GPIO numbers.

Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4373a5e2

drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

+13 −14
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ 
  Maintainer: Giuseppe Cavallaro <peppe.cavallaro@st.com>

*******************************************************************************/



#include <linux/gpio/consumer.h>

#include <linux/io.h>

#include <linux/iopoll.h>

#include <linux/mii.h>

#include <linux/of.h>

#include <linux/of_gpio.h>

#include <linux/of_mdio.h>

#include <linux/phy.h>

#include <linux/slab.h>
@@ -251,37 +251,36 @@ int stmmac_mdio_reset(struct mii_bus *bus) 


#ifdef CONFIG_OF

	if (priv->device->of_node) {

		struct gpio_desc *reset_gpio;



		if (data->reset_gpio < 0) {

			struct device_node *np = priv->device->of_node;



			if (!np)

				return 0;



			data->reset_gpio = of_get_named_gpio(np,

						"snps,reset-gpio", 0);

			if (data->reset_gpio < 0)

				return 0;

			reset_gpio = devm_gpiod_get_optional(priv->device,

							     "snps,reset",

							     GPIOD_OUT_LOW);

			if (IS_ERR(reset_gpio))

				return PTR_ERR(reset_gpio);



			data->active_low = of_property_read_bool(np,

						"snps,reset-active-low");

			of_property_read_u32_array(np,

				"snps,reset-delays-us", data->delays, 3);

		} else {

			reset_gpio = gpio_to_desc(data->reset_gpio);



			if (devm_gpio_request(priv->device, data->reset_gpio,

					      "mdio-reset"))

				return 0;

			gpiod_direction_output(reset_gpio, 0);

		}



		gpio_direction_output(data->reset_gpio,

				      data->active_low ? 1 : 0);

		if (data->delays[0])

			msleep(DIV_ROUND_UP(data->delays[0], 1000));



		gpio_set_value(data->reset_gpio, data->active_low ? 0 : 1);

		gpiod_set_value_cansleep(reset_gpio, 1);

		if (data->delays[1])

			msleep(DIV_ROUND_UP(data->delays[1], 1000));



		gpio_set_value(data->reset_gpio, data->active_low ? 1 : 0);

		gpiod_set_value_cansleep(reset_gpio, 0);

		if (data->delays[2])

			msleep(DIV_ROUND_UP(data->delays[2], 1000));

	}

include/linux/stmmac.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ struct stmmac_mdio_bus_data { 
	int *irqs;

	int probed_phy_irq;

#ifdef CONFIG_OF

	int reset_gpio, active_low;

	int reset_gpio;

	u32 delays[3];

#endif

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE