diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-16 13:53:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-16 13:55:29 -0700 |
| commit | 4e18a8a149d5577a171ddc5fe80cc715041b193d (patch) | |
| tree | 0c4548f093eb88427d8c17bae8af3f2c29f132ab /drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | |
| parent | a51486266c3ba8e035a47fa96df67f274fe0c7d0 (diff) | |
| parent | fead5b1b5838ba2f231d76e1b8ed31a4e9449382 (diff) | |
Merge branch 'stmmac-cleanups-for-stmmac_mdio_reset'
Martin Blumenstingl says:
====================
stmmac: cleanups for stmmac_mdio_reset
This is a successor to my previous series "stmmac: honor the GPIO flags
for the PHY reset GPIO" from [0]. It contains only the "cleanup"
patches from that series plus some additional cleanups on top.
I broke out the actual GPIO flag handling into a separate patch which
is already part of net-next: "net: stmmac: use GPIO descriptors in
stmmac_mdio_reset" from [1]
I have build and runtime tested this on my ARM Meson8b Odroid-C1.
[0] https://patchwork.kernel.org/cover/10983801/
[1] https://patchwork.ozlabs.org/patch/1114798/
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index 7cbc01f316fa..2a47d3b98379 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@ -73,7 +73,6 @@ static void common_default_data(struct plat_stmmacenet_data *plat) plat->has_gmac = 1; plat->force_sf_dma_mode = 1; - plat->mdio_bus_data->phy_reset = NULL; plat->mdio_bus_data->phy_mask = 0; /* Set default value for multicast hash bins */ |