Skip to contentSkip to conversation

net: lpc_eth: parse phy nodes from device tree

PATCH In review Alexandre Belloni 2 participants 4 messages Oct 17, 2019 – Oct 18, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v3 cover net: lpc_eth: parse phy nodes from device tree

Allow describing connected phys using device tree. This solves issues finding the phy on the mdio bus and allows decribing the interrupt line the phy is possibly connected to.

Changes in v3:
- rebased on net-next
- collected Reviewed-by

Changes in v2:
- move the phy decription in the mdio subnode.

Alexandre Belloni (2):
dt-bindings: net: lpc-eth: document optional properties
net: lpc_eth: parse phy nodes from device tree

 .../devicetree/bindings/net/lpc-eth.txt       |  5 ++++
 drivers/net/ethernet/nxp/lpc_eth.c            | 28 +++++++++++++------
 2 files changed, 25 insertions(+), 8 deletions(-)
Signature · 1 line
2.21.0
#1 lore raw

PATCH v3 1/2 dt-bindings: net: lpc-eth: document optional properties

The Ethernet controller is also an mdio controller, to be able to parse children (phys for example), and mdio node must be present.

---
 Documentation/devicetree/bindings/net/lpc-eth.txt | 5 +++++
 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/net/lpc-eth.txt +5 -0
index b92e927808b6..cfe0e5991d46 100644
@@ -10,6 +10,11 @@ Optional properties:
   absent, "rmii" is assumed.
 - use-iram: Use LPC32xx internal SRAM (IRAM) for DMA buffering
 
+Optional subnodes:
+- mdio : specifies the mdio bus, used as a container for phy nodes according to
+  phy.txt in the same directory
+
+
 Example:
 
 	mac: ethernet@31060000 {
Signature · 1 line
2.21.0
#2 lore raw

PATCH v3 2/2 net: lpc_eth: parse phy nodes from device tree

In reply to Alexandre Belloni

When connected to a micrel phy, phy_find_first doesn't work properly because the first phy found is on address 0, the broadcast address but, the first thing the phy driver is doing is disabling this broadcast address. The phy is then available only on address 1 but the mdio driver doesn't know about it.

Instead, register the mdio bus using of_mdiobus_register and try to find the phy description in device tree before falling back to phy_find_first.

This ultimately also allows to describe the interrupt the phy is connected to.

---
 drivers/net/ethernet/nxp/lpc_eth.c | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/net/ethernet/nxp/lpc_eth.c +20 -8
index 141571e2ec11..501782e233b3 100644
@@ -15,6 +15,7 @@
 #include <linux/etherdevice.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_mdio.h>
 #include <linux/of_net.h>
 #include <linux/phy.h>
 #include <linux/platform_device.h>
@@ -391,6 +392,7 @@ struct rx_status_t {
 struct netdata_local {
 	struct platform_device	*pdev;
 	struct net_device	*ndev;
+	struct device_node	*phy_node;
 	spinlock_t		lock;
 	void __iomem		*net_base;
 	u32			msg_enable;
@@ -749,22 +751,26 @@ static void lpc_handle_link_change(struct net_device *ndev)
 static int lpc_mii_probe(struct net_device *ndev)
 {
 	struct netdata_local *pldat = netdev_priv(ndev);
-	struct phy_device *phydev = phy_find_first(pldat->mii_bus);
-
-	if (!phydev) {
-		netdev_err(ndev, "no PHY found\n");
-		return -ENODEV;
-	}
+	struct phy_device *phydev;
 
 	/* Attach to the PHY */
 	if (lpc_phy_interface_mode(&pldat->pdev->dev) == PHY_INTERFACE_MODE_MII)
 		netdev_info(ndev, "using MII interface\n");
 	else
 		netdev_info(ndev, "using RMII interface\n");
+
+	if (pldat->phy_node)
+		phydev =  of_phy_find_device(pldat->phy_node);
+	else
+		phydev = phy_find_first(pldat->mii_bus);
+	if (!phydev) {
+		netdev_err(ndev, "no PHY found\n");
+		return -ENODEV;
+	}
+
 	phydev = phy_connect(ndev, phydev_name(phydev),
 			     &lpc_handle_link_change,
 			     lpc_phy_interface_mode(&pldat->pdev->dev));
-
 	if (IS_ERR(phydev)) {
 		netdev_err(ndev, "Could not attach to PHY\n");
 		return PTR_ERR(phydev);
@@ -783,6 +789,7 @@ static int lpc_mii_probe(struct net_device *ndev)
 
 static int lpc_mii_init(struct netdata_local *pldat)
 {
+	struct device_node *node;
 	int err = -ENXIO;
 
 	pldat->mii_bus = mdiobus_alloc();
@@ -812,7 +819,10 @@ static int lpc_mii_init(struct netdata_local *pldat)
 
 	platform_set_drvdata(pldat->pdev, pldat->mii_bus);
 
-	if (mdiobus_register(pldat->mii_bus))
+	node = of_get_child_by_name(pldat->pdev->dev.of_node, "mdio");
+	err = of_mdiobus_register(pldat->mii_bus, node);
+	of_node_put(node);
+	if (err)
 		goto err_out_unregister_bus;
 
 	if (lpc_mii_probe(pldat->ndev) != 0)
@@ -1345,6 +1355,8 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
 	netdev_dbg(ndev, "DMA buffer V address :0x%p\n",
 			pldat->dma_buff_base_v);
 
+	pldat->phy_node = of_parse_phandle(np, "phy-handle", 0);
+
 	/* Get MAC address from current HW setting (POR state is all zeros) */
 	__lpc_get_mac(pldat, ndev->dev_addr);
 
Signature · 1 line
2.21.0
maintainer
#3 lore raw
In reply to Alexandre Belloni

From: Alexandre Belloni <[email protected]>
Date: Fri, 18 Oct 2019 00:22:29 +0200

Quoted 10 lines

Allow describing connected phys using device tree. This solves issues finding the phy on the mdio bus and allows decribing the interrupt line the phy is possibly connected to.

Changes in v3:
- rebased on net-next
- collected Reviewed-by

Changes in v2:
- move the phy decription in the mdio subnode.

Series applied to net-next, thank you.