UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: stmmac: drop the reset GPIO from struct stmmac_mdio_bus_data 

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>
This commit is contained in:
Martin Blumenstingl 2019-06-15 12:09:30 +02:00 committed by David S. Miller
parent 42a90766fe
commit 7e770b252a
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
View File

@ -253,21 +253,15 @@ int stmmac_mdio_reset(struct mii_bus *bus)
if (priv->device->of_node) { if (priv->device->of_node) {
struct gpio_desc *reset_gpio; struct gpio_desc *reset_gpio;
if (data->reset_gpio < 0) { reset_gpio = devm_gpiod_get_optional(priv->device,
reset_gpio = devm_gpiod_get_optional(priv->device, "snps,reset",
"snps,reset", GPIOD_OUT_LOW);
GPIOD_OUT_LOW); if (IS_ERR(reset_gpio))
if (IS_ERR(reset_gpio)) return PTR_ERR(reset_gpio);
return PTR_ERR(reset_gpio);
device_property_read_u32_array(priv->device, device_property_read_u32_array(priv->device,
"snps,reset-delays-us", "snps,reset-delays-us",
data->delays, 3); data->delays, 3);
} else {
reset_gpio = gpio_to_desc(data->reset_gpio);
gpiod_direction_output(reset_gpio, 0);
}
if (data->delays[0]) if (data->delays[0])
msleep(DIV_ROUND_UP(data->delays[0], 1000)); msleep(DIV_ROUND_UP(data->delays[0], 1000));
@ -323,11 +317,6 @@ int stmmac_mdio_register(struct net_device *ndev)
if (mdio_bus_data->irqs) if (mdio_bus_data->irqs)
memcpy(new_bus->irq, mdio_bus_data->irqs, sizeof(new_bus->irq)); 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"; new_bus->name = "stmmac";
if (priv->plat->has_xgmac) { if (priv->plat->has_xgmac) {

1
include/linux/stmmac.h
View File

@ -97,7 +97,6 @@ struct stmmac_mdio_bus_data {
int *irqs; int *irqs;
int probed_phy_irq; int probed_phy_irq;
#ifdef CONFIG_OF #ifdef CONFIG_OF
int reset_gpio;
u32 delays[3]; u32 delays[3];
#endif #endif
}; };