Skip to content

Commit

Permalink
net: stmmac: drop the reset GPIO from struct stmmac_mdio_bus_data
Browse files Browse the repository at this point in the history
No platform uses the "reset_gpio" field from stmmac_mdio_bus_data
anymore. Drop it so we don't get any new consumers either.

Plain GPIO numbers are being deprecated in favor of GPIO descriptors. If
needed any new non-OF platform can add a GPIO descriptor lookup table.
devm_gpiod_get_optional() will find the GPIO in that case.

Suggested-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Martin Blumenstingl authored and David S. Miller committed Jun 16, 2019
1 parent 42a9076 commit 7e770b2
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 21 deletions.
29 changes: 9 additions & 20 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -253,21 +253,15 @@ int stmmac_mdio_reset(struct mii_bus *bus)
if (priv->device->of_node) {
struct gpio_desc *reset_gpio;

if (data->reset_gpio < 0) {
reset_gpio = devm_gpiod_get_optional(priv->device,
"snps,reset",
GPIOD_OUT_LOW);
if (IS_ERR(reset_gpio))
return PTR_ERR(reset_gpio);

device_property_read_u32_array(priv->device,
"snps,reset-delays-us",
data->delays, 3);
} else {
reset_gpio = gpio_to_desc(data->reset_gpio);

gpiod_direction_output(reset_gpio, 0);
}
reset_gpio = devm_gpiod_get_optional(priv->device,
"snps,reset",
GPIOD_OUT_LOW);
if (IS_ERR(reset_gpio))
return PTR_ERR(reset_gpio);

device_property_read_u32_array(priv->device,
"snps,reset-delays-us",
data->delays, 3);

if (data->delays[0])
msleep(DIV_ROUND_UP(data->delays[0], 1000));
Expand Down Expand Up @@ -323,11 +317,6 @@ int stmmac_mdio_register(struct net_device *ndev)
if (mdio_bus_data->irqs)
memcpy(new_bus->irq, mdio_bus_data->irqs, sizeof(new_bus->irq));

#ifdef CONFIG_OF
if (priv->device->of_node)
mdio_bus_data->reset_gpio = -1;
#endif

new_bus->name = "stmmac";

if (priv->plat->has_xgmac) {
Expand Down
1 change: 0 additions & 1 deletion include/linux/stmmac.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ struct stmmac_mdio_bus_data {
int *irqs;
int probed_phy_irq;
#ifdef CONFIG_OF
int reset_gpio;
u32 delays[3];
#endif
};
Expand Down

0 comments on commit 7e770b2

Please sign in to comment.