public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
* [U-Boot] [PATCH v6 1/7] drivers: net: cpsw: Add reading of DT phy-handle node
@ 2016-04-15 12:27 Dan Murphy
  2016-04-15 12:27 ` [U-Boot] [PATCH v6 2/7] net: zynq_gem: Add the passing of the " Dan Murphy
                   ` (8 more replies)
  0 siblings, 9 replies; 33+ messages in thread
From: Dan Murphy @ 2016-04-15 12:27 UTC (permalink / raw)
  To: u-boot

Add the ability to read the phy-handle node of the
cpsw slave.  Upon reading this handle the phy-id
can be stored based on the reg node in the DT.

The phy-handle also needs to be stored and passed
to the phy to access any phy data that is available.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
---

v6 - Fix build error when DM_ETH is not defined and updated phy_handle error handling - https://patchwork.ozlabs.org/patch/608763/

 drivers/net/cpsw.c | 20 ++++++++++++++++++--
 include/cpsw.h     |  1 +
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/drivers/net/cpsw.c b/drivers/net/cpsw.c
index 7104754..3d6f0ce 100644
--- a/drivers/net/cpsw.c
+++ b/drivers/net/cpsw.c
@@ -965,6 +965,11 @@ static int cpsw_phy_init(struct cpsw_priv *priv, struct cpsw_slave *slave)
 	phydev->supported &= supported;
 	phydev->advertising = phydev->supported;
 
+#ifdef CONFIG_DM_ETH
+	if (slave->data->phy_of_handle)
+		phydev->dev->of_offset = slave->data->phy_of_handle;
+#endif
+
 	priv->phydev = phydev;
 	phy_config(phydev);
 
@@ -1217,8 +1222,19 @@ static int cpsw_eth_ofdata_to_platdata(struct udevice *dev)
 			if (phy_mode)
 				priv->data.slave_data[slave_index].phy_if =
 					phy_get_interface_by_name(phy_mode);
-			fdtdec_get_int_array(fdt, subnode, "phy_id", phy_id, 2);
-			priv->data.slave_data[slave_index].phy_addr = phy_id[1];
+
+			priv->data.slave_data[slave_index].phy_of_handle =
+				fdtdec_lookup_phandle(fdt, subnode, "phy-handle");
+
+			if (priv->data.slave_data[slave_index].phy_of_handle >= 0) {
+				priv->data.slave_data[slave_index].phy_addr =
+					fdtdec_get_int(gd->fdt_blob,
+						priv->data.slave_data[slave_index].phy_of_handle,
+						"reg", -1);
+			} else {
+				fdtdec_get_int_array(fdt, subnode, "phy_id", phy_id, 2);
+				priv->data.slave_data[slave_index].phy_addr = phy_id[1];
+			}
 			slave_index++;
 		}
 
diff --git a/include/cpsw.h b/include/cpsw.h
index cf1d30b..ff95cd8 100644
--- a/include/cpsw.h
+++ b/include/cpsw.h
@@ -21,6 +21,7 @@ struct cpsw_slave_data {
 	u32		sliver_reg_ofs;
 	int		phy_addr;
 	int		phy_if;
+	int		phy_of_handle;
 };
 
 enum {
-- 
2.8.1.116.g7b0d47b

^ permalink raw reply related	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2016-04-28 12:26 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-15 12:27 [U-Boot] [PATCH v6 1/7] drivers: net: cpsw: Add reading of DT phy-handle node Dan Murphy
2016-04-15 12:27 ` [U-Boot] [PATCH v6 2/7] net: zynq_gem: Add the passing of the " Dan Murphy
2016-04-20 19:41   ` Dan Murphy
2016-04-21  5:46     ` Michal Simek
2016-04-21 11:51       ` Tom Rini
2016-04-21 13:42         ` Michal Simek
2016-04-25 21:39   ` Joe Hershberger
2016-04-15 12:27 ` [U-Boot] [PATCH v6 3/7] net: phy: dp83867: Add device tree bindings and documentation Dan Murphy
2016-04-21  6:00   ` Mugunthan V N
2016-04-25 21:40   ` Joe Hershberger
2016-04-15 12:27 ` [U-Boot] [PATCH v6 4/7] net: phy: ti: Allow the driver to be more configurable Dan Murphy
2016-04-21  6:00   ` Mugunthan V N
2016-04-25 21:35   ` Joe Hershberger
2016-04-26 21:44     ` Joe Hershberger
2016-04-27 15:46       ` Dan Murphy
2016-04-28  4:52         ` Joe Hershberger
2016-04-28  6:26           ` Michal Simek
2016-04-28 12:26             ` Dan Murphy
2016-04-15 12:27 ` [U-Boot] [PATCH v6 5/7] net: phy: Move is_rgmii helper to phy.h Dan Murphy
2016-04-21  6:00   ` Mugunthan V N
2016-04-25 21:36   ` Joe Hershberger
2016-04-15 12:27 ` [U-Boot] [PATCH v6 6/7] net: phy: Add phy_interface_is_sgmii " Dan Murphy
2016-04-21  6:01   ` Mugunthan V N
2016-04-25 21:40   ` Joe Hershberger
2016-04-15 12:27 ` [U-Boot] [PATCH v6 7/7] net: phy: dp83867: Add SGMII helper for configuration Dan Murphy
2016-04-21  6:01   ` Mugunthan V N
2016-04-25 21:37   ` Joe Hershberger
2016-04-20 19:41 ` [U-Boot] [PATCH v6 1/7] drivers: net: cpsw: Add reading of DT phy-handle node Dan Murphy
2016-04-21  5:59 ` Mugunthan V N
2016-04-25 21:32 ` Joe Hershberger
2016-04-26 21:42   ` Joe Hershberger
2016-04-27 15:44     ` Dan Murphy
2016-04-28  4:47       ` Joe Hershberger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox