RE: [PATCH 4/4] phylib: Add of_phy_attach

-----Original Message-----
From: shh.xie@gmail.com [mailto:shh.xie@gmail.com]
Sent: Monday, November 11, 2013 7:08 PM
To: linuxppc-dev@lists.ozlabs.org; linux-kernel@vger.kernel.org
Cc: Bucur Madalin-Cristian-B32716; Kanetkar Shruti-B44454; Xie Shaohui-B21989
Subject: [PATCH 4/4] phylib: Add of_phy_attach

From: Andy Fleming

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: Andy Fleming
Signed-off-by: Shaohui Xie <redacted>
---
 drivers/of/of_mdio.c    | 22 ++++++++++++++++++++--
 include/linux/of_mdio.h |  8 ++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index d5a57a9..a748274

100644

--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c

@@ -221,8 +221,7 @@ EXPORT_SYMBOL(of_phy_connect);
  * not call this function from new drivers.
  */
 struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
-					     void (*hndlr)(struct net_device *),
-					     phy_interface_t iface)
+		void (*hndlr)(struct net_device *), phy_interface_t iface)
 {
 	struct device_node *net_np;
 	char bus_id[MII_BUS_ID_SIZE + 3];

@@ -247,3 +246,22 @@ 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);

diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h index

8163107..dcda44d 100644

--- a/include/linux/of_mdio.h
+++ b/include/linux/of_mdio.h

@@ -19,6 +19,8 @@ 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);
+extern 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 +46,12 @@ 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)
--
1.8.4.1