GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-01 03:57:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: stmmac: drop the reset delays from struct stmmac_mdio_bus_data

Browse source 
Only OF platforms use the reset delays and these delays are only read in
stmmac_mdio_reset(). Move them from struct stmmac_mdio_bus_data to a
stack variable inside stmmac_mdio_reset() because that's the only usage
of these delays.

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:31 +02:00 • committed by David S. Miller
parent 7e770b252a
commit ce4ab73ab0
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
View file

@ -252,6 +252,7 @@ int stmmac_mdio_reset(struct mii_bus *bus)
#ifdef CONFIG_OF #ifdef CONFIG_OF
if (priv->device->of_node) { if (priv->device->of_node) {
struct gpio_desc *reset_gpio; struct gpio_desc *reset_gpio;
u32 delays[3];
reset_gpio = devm_gpiod_get_optional(priv->device, reset_gpio = devm_gpiod_get_optional(priv->device,
"snps,reset", "snps,reset",
@ -261,18 +262,18 @@ int stmmac_mdio_reset(struct mii_bus *bus)
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); delays, ARRAY_SIZE(delays));
if (data->delays[0]) if (delays[0])
msleep(DIV_ROUND_UP(data->delays[0], 1000)); msleep(DIV_ROUND_UP(delays[0], 1000));
gpiod_set_value_cansleep(reset_gpio, 1); gpiod_set_value_cansleep(reset_gpio, 1);
if (data->delays[1]) if (delays[1])
msleep(DIV_ROUND_UP(data->delays[1], 1000)); msleep(DIV_ROUND_UP(delays[1], 1000));
gpiod_set_value_cansleep(reset_gpio, 0); gpiod_set_value_cansleep(reset_gpio, 0);
if (data->delays[2]) if (delays[2])
msleep(DIV_ROUND_UP(data->delays[2], 1000)); msleep(DIV_ROUND_UP(delays[2], 1000));
} }
#endif #endif

3
include/linux/stmmac.h
View file

@ -96,9 +96,6 @@ struct stmmac_mdio_bus_data {
unsigned int phy_mask; unsigned int phy_mask;
int *irqs; int *irqs;
int probed_phy_irq; int probed_phy_irq;
#ifdef CONFIG_OF
u32 delays[3];
#endif
}; };
struct stmmac_dma_cfg { struct stmmac_dma_cfg {