Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a62964c authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: phylink: Allow specifying PHY device flags 



In order to let subsystems like DSA fully utilize PHYLINK, we need to be able
to communicate phy_device::flags from of_phy_{connect,attach} even when using
PHYLINK APIs.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7268586b

drivers/net/phy/phylink.c

+5 −2
Original line number Diff line number Diff line
@@ -731,6 +731,7 @@ EXPORT_SYMBOL_GPL(phylink_connect_phy); 
 * phylink_of_phy_connect() - connect the PHY specified in the DT mode.

 * @pl: a pointer to a &struct phylink returned from phylink_create()

 * @dn: a pointer to a &struct device_node.

 * @flags: PHY-specific flags to communicate to the PHY device driver

 *

 * Connect the phy specified in the device node @dn to the phylink instance

 * specified by @pl. Actions specified in phylink_connect_phy() will be
@@ -738,7 +739,8 @@ EXPORT_SYMBOL_GPL(phylink_connect_phy); 
 *

 * Returns 0 on success or a negative errno.

 */

int phylink_of_phy_connect(struct phylink *pl, struct device_node *dn)

int phylink_of_phy_connect(struct phylink *pl, struct device_node *dn,

			   u32 flags)

{

	struct device_node *phy_node;

	struct phy_device *phy_dev;
@@ -764,7 +766,8 @@ int phylink_of_phy_connect(struct phylink *pl, struct device_node *dn) 
		return 0;

	}



	phy_dev = of_phy_attach(pl->netdev, phy_node, 0, pl->link_interface);

	phy_dev = of_phy_attach(pl->netdev, phy_node, flags,

				pl->link_interface);

	/* We're done with the phy_node handle */

	of_node_put(phy_node);

include/linux/phylink.h

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ 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 *);



void phylink_mac_change(struct phylink *, bool up);