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

Commit 7614aba6 authored by Andy Fleming's avatar Andy Fleming Committed by David S. Miller
Browse files

phylib: Add of_phy_attach 



10G PHYs don't currently support running the state machine, which
is implicitly setup via of_phy_connect(). Therefore, it is necessary
to implement an OF version of phy_attach(), which does everything
except start the state machine.

Signed-off-by: default avatarAndy Fleming <afleming@gmail.com>
Signed-off-by: default avatarShaohui Xie <Shaohui.Xie@freescale.com>
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 257184d7

drivers/of/of_mdio.c

+20 −0
Original line number Diff line number Diff line
@@ -254,3 +254,23 @@ struct phy_device *of_phy_connect_fixed_link(struct net_device *dev, 
	return IS_ERR(phy) ? NULL : phy;

}

EXPORT_SYMBOL(of_phy_connect_fixed_link);



/**

 * of_phy_attach - Attach to a PHY without starting the state machine

 * @dev: pointer to net_device claiming the phy

 * @phy_np: Node pointer for the PHY

 * @flags: flags to pass to the PHY

 * @iface: PHY data interface type

 */

struct phy_device *of_phy_attach(struct net_device *dev,

				 struct device_node *phy_np, u32 flags,

				 phy_interface_t iface)

{

	struct phy_device *phy = of_phy_find_device(phy_np);



	if (!phy)

		return NULL;



	return phy_attach_direct(dev, phy, flags, iface) ? NULL : phy;

}

EXPORT_SYMBOL(of_phy_attach);

include/linux/of_mdio.h

+10 −0
Original line number Diff line number Diff line
@@ -19,6 +19,9 @@ extern struct phy_device *of_phy_connect(struct net_device *dev, 
					 struct device_node *phy_np,

					 void (*hndlr)(struct net_device *),

					 u32 flags, phy_interface_t iface);

struct phy_device *of_phy_attach(struct net_device *dev,

				 struct device_node *phy_np, u32 flags,

				 phy_interface_t iface);

extern struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,

					 void (*hndlr)(struct net_device *),

					 phy_interface_t iface);
@@ -44,6 +47,13 @@ static inline struct phy_device *of_phy_connect(struct net_device *dev, 
	return NULL;

}



static inline struct phy_device *of_phy_attach(struct net_device *dev,

					       struct device_node *phy_np,

					       u32 flags, phy_interface_t iface)

{

	return NULL;

}



static inline struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,

							   void (*hndlr)(struct net_device *),

							   phy_interface_t iface)