diff options
| author | David S. Miller <davem@davemloft.net> | 2014-02-17 16:40:24 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-02-17 16:40:24 -0500 |
| commit | 92e8c831d831ff97913b71e178d184106c0dee0f (patch) | |
| tree | 3d28d96b16090e2ac42bc51b75cf763becc0335a /include/linux | |
| parent | ee0c4c39c577d07c05749a5f5b960b4c0fdd8097 (diff) | |
| parent | 7f6224b7c73b6ce66b6a07e4a0c3b826540b13bb (diff) | |
Merge branch 'phy'
Florian Fainelli says:
====================
net: phy: soft reset rework for 10G PHYs
As reported by Shaohui, 10G PHYs may have a slightly more complex reset
sequence for which a BMCR_RESET software reset might not suffice. This
patchset offers a solution for those by allowing them to implement their
own soft_reset() callback. Finally there is an update to the PHY library
Documentation to cover for the newly added callbacks of the PHY driver
structure.
Changes in v2:
- fixed callback testing
- fixed typo in Documentation
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/phy.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index f7fe54628424..24126c4b27b5 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -440,6 +440,11 @@ struct phy_driver { u32 flags; /* + * Called to issue a PHY software reset + */ + int (*soft_reset)(struct phy_device *phydev); + + /* * Called to initialize the PHY, * including after a reset */ @@ -666,6 +671,7 @@ int genphy_update_link(struct phy_device *phydev); int genphy_read_status(struct phy_device *phydev); int genphy_suspend(struct phy_device *phydev); int genphy_resume(struct phy_device *phydev); +int genphy_soft_reset(struct phy_device *phydev); void phy_driver_unregister(struct phy_driver *drv); void phy_drivers_unregister(struct phy_driver *drv, int n); int phy_driver_register(struct phy_driver *new_driver); |