diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-16 23:53:41 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-16 23:55:29 +0300 |
| commit | 4e18a8a149d5577a171ddc5fe80cc715041b193d (patch) | |
| tree | 0c4548f093eb88427d8c17bae8af3f2c29f132ab /include/linux | |
| parent | a51486266c3ba8e035a47fa96df67f274fe0c7d0 (diff) | |
| parent | fead5b1b5838ba2f231d76e1b8ed31a4e9449382 (diff) | |
| download | linux-4e18a8a149d5577a171ddc5fe80cc715041b193d.tar.xz | |
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 'include/linux')
| -rw-r--r-- | include/linux/stmmac.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index a3c2d9945bcf..6dfb5aa75b0c 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -92,14 +92,9 @@ /* Platfrom data for platform device structure's platform_data field */ struct stmmac_mdio_bus_data { - int (*phy_reset)(void *priv); unsigned int phy_mask; int *irqs; int probed_phy_irq; -#ifdef CONFIG_OF - int reset_gpio; - u32 delays[3]; -#endif }; struct stmmac_dma_cfg { |