diff options
| author | David S. Miller <davem@davemloft.net> | 2017-12-13 23:55:02 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-12-13 23:55:02 +0300 |
| commit | 824c2d672ad8cab9b9f3397031db587f66a181ea (patch) | |
| tree | 75716a3ae3b78d78cd8f0c1ddd0c5218e6b98881 /include/linux | |
| parent | 7268586baa530312041e597b518b5c6a05110df1 (diff) | |
| parent | 4be11ef0bdf5b3a4861d5b65bcdf32f2bfbc5263 (diff) | |
| download | linux-824c2d672ad8cab9b9f3397031db587f66a181ea.tar.xz | |
Merge branch 'phylink-dsa-prep'
Florian Fainelli says:
====================
PHYLINK preparatory patches for DSA
In preparation for having DSA migrate to PHYLINK, I had to come up with a
number of preparatory patches:
- we need to be able to pass phy_flags from an external component calling
phylink_of_phy_connect()
- DSA tries to connect through OF first, then fallsback using its own internal
MDIO bus, in that case we would both show an error, but also not know what
the correct phy_interface_t would be, instead use the PHY device/driver provided
one
- Finally bcm_sf2 makes use of all possible PHYs out there: internal, external,
fixed, and MoCA, the latter requires a bit of help to signal link notifications
through a MMIO interrupt, as well a report a correct PORT type
Changes in v2:
- rebased against latest net-next/master
- added kernel doc documentation
- dropped error message in phylink_of_phy_connect() as suggested by Russell
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/phylink.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/phylink.h b/include/linux/phylink.h index 4f0f452ff38d..bd137c273d38 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -188,8 +188,11 @@ struct phylink *phylink_create(struct net_device *, struct fwnode_handle *, void phylink_destroy(struct phylink *); int phylink_connect_phy(struct phylink *, struct phy_device *); -int phylink_of_phy_connect(struct phylink *, struct device_node *); +int phylink_of_phy_connect(struct phylink *, struct device_node *, u32 flags); void phylink_disconnect_phy(struct phylink *); +int phylink_fixed_state_cb(struct phylink *, + void (*cb)(struct net_device *dev, + struct phylink_link_state *)); void phylink_mac_change(struct phylink *, bool up); |