diff options
| author | David S. Miller <davem@davemloft.net> | 2013-12-10 05:39:05 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-12-10 05:39:05 +0400 |
| commit | 65be6291c856bee0308c535287f813418402d8b3 (patch) | |
| tree | bc291d4587494cd5419e672eaeb3e9682239c608 /include/linux/phy.h | |
| parent | 73713357ab58aacda1af715bb5a623528dbbfd79 (diff) | |
| parent | 0c9eb5b931c3da3a79faa889b903dc7bd318203c (diff) | |
| download | linux-65be6291c856bee0308c535287f813418402d8b3.tar.xz | |
Merge branch 'phy_reset'
Florian Fainelli says:
====================
net: phy: consolidate PHY reset
This patchset consolidates the PHY reset through the MII BMCR
register by using a central place were this is done.
This patchset resumes the work Kyle Moffett started here:
https://lkml.org/lkml/2011/10/20/301
Note that at this point, drivers doing funky things after issuing
a PHY reset using phy_init_hw() will still suffer from PHY state
machine problems, this will be taken care of later on.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/phy.h')
| -rw-r--r-- | include/linux/phy.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 7ff751ae6f0a..90a666e0884b 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -287,8 +287,8 @@ struct phy_c45_device_ids { * adjust_state: Callback for the enet driver to respond to * changes in the state machine. * - * speed, duplex, pause, supported, advertising, and - * autoneg are used like in mii_if_info + * speed, duplex, pause, supported, advertising, lp_advertising, + * and autoneg are used like in mii_if_info * * interrupts currently only supports enabled or disabled, * but could be changed in the future to support enabling @@ -340,6 +340,7 @@ struct phy_device { /* See mii.h for more info */ u32 supported; u32 advertising; + u32 lp_advertising; int autoneg; |