]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge branch 'stmmac-cleanups-for-stmmac_mdio_reset'
authorDavid S. Miller <davem@davemloft.net>
Sun, 16 Jun 2019 20:53:41 +0000 (13:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 16 Jun 2019 20:55:29 +0000 (13:55 -0700)
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>
1  2 
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c

index 7cbc01f316facf363e68a6623ea41aaef8e02a4e,7cbc01f316facf363e68a6623ea41aaef8e02a4e..2a47d3b98379d23050c6dd26b13c148c0765913d
@@@ -73,7 -73,7 +73,6 @@@ static void common_default_data(struct 
        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 */