diff options
| author | David S. Miller <davem@davemloft.net> | 2018-01-02 23:00:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-01-02 23:00:50 +0300 |
| commit | dc917aec77c0255ba20d582a72a0137f7321f17c (patch) | |
| tree | 87d806a67ec3ecf3b84d9af0c70ca69b33265745 /include/linux/phy.h | |
| parent | 3abbcccc6f318f858ffbd4e3d82839b66ff1b960 (diff) | |
| parent | 6798d03cfa5ed2f20a4cf33da1d31eba80b4714f (diff) | |
| download | linux-dc917aec77c0255ba20d582a72a0137f7321f17c.tar.xz | |
Merge branch 'marvell10g-phy-updates'
Russell King says:
====================
marvell10g updates
This series:
- adds MDI/MDIX reporting
- adds support for 10/100Mbps half-duplex link modes
- adds a comment describing the setup on VF610 ZII boards (where
the phy interface mode doesn't change.)
- cleans up the phy interace mode switching
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/phy.h')
| -rw-r--r-- | include/linux/phy.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index c4b4715caa21..a052e3768422 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -690,6 +690,8 @@ phy_lookup_setting(int speed, int duplex, const unsigned long *mask, size_t phy_speeds(unsigned int *speeds, size_t size, unsigned long *mask, size_t maxbit); +void phy_resolve_aneg_linkmode(struct phy_device *phydev); + /** * phy_read_mmd - Convenience function for reading a register * from an MMD on a given PHY. @@ -901,6 +903,7 @@ int genphy_c45_read_lpa(struct phy_device *phydev); int genphy_c45_read_pma(struct phy_device *phydev); int genphy_c45_pma_setup_forced(struct phy_device *phydev); int genphy_c45_an_disable_aneg(struct phy_device *phydev); +int genphy_c45_read_mdix(struct phy_device *phydev); static inline int phy_read_status(struct phy_device *phydev) { |