From: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> To: <netdev@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org> Cc: <nicolas.ferre@microchip.com>, <claudiu.beznea@microchip.com>, <davem@davemloft.net>, <kuba@kernel.org>, <andrew@lunn.ch>, <f.fainelli@gmail.com>, <robh+dt@kernel.org>, <alexandre.belloni@bootlin.com>, <ludovic.desroches@microchip.com>, "Codrin Ciubotariu" <codrin.ciubotariu@microchip.com> Subject: [PATCH net-next 3/7] net: macb: parse PHY nodes found under an MDIO node Date: Tue, 21 Jul 2020 13:02:30 +0300 [thread overview] Message-ID: <20200721100234.1302910-4-codrin.ciubotariu@microchip.com> (raw) In-Reply-To: <20200721100234.1302910-1-codrin.ciubotariu@microchip.com> The MACB embeds an MDIO bus controller. For this reason, the PHY nodes were represented as sub-nodes in the MACB node. Generally, the Ethernet controller is different than the MDIO controller, so the PHYs are probed by a separate MDIO driver. Since adding the PHY nodes directly under the ETH node became deprecated, we adjust the MACB driver to look for an MDIO node and register the subnode MDIO devices. Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> --- drivers/net/ethernet/cadence/macb_main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 89fe7af5e408..66f02c16cc7c 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -740,10 +740,20 @@ static int macb_mii_probe(struct net_device *dev) static int macb_mdiobus_register(struct macb *bp) { struct device_node *child, *np = bp->pdev->dev.of_node; + struct device_node *mdio_node; + int ret; if (of_phy_is_fixed_link(np)) return mdiobus_register(bp->mii_bus); + /* if an MDIO node is present, it should contain the PHY nodes */ + mdio_node = of_get_child_by_name(np, "mdio"); + if (mdio_node) { + ret = of_mdiobus_register(bp->mii_bus, mdio_node); + of_node_put(mdio_node); + return ret; + } + /* Only create the PHY from the device tree if at least one PHY is * described. Otherwise scan the entire MDIO bus. We do this to support * old device tree that did not follow the best practices and did not @@ -755,7 +765,6 @@ static int macb_mdiobus_register(struct macb *bp) * decrement it before returning. */ of_node_put(child); - return of_mdiobus_register(bp->mii_bus, np); } -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> To: <netdev@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux-kernel@vger.kernel.org> Cc: andrew@lunn.ch, alexandre.belloni@bootlin.com, f.fainelli@gmail.com, claudiu.beznea@microchip.com, ludovic.desroches@microchip.com, robh+dt@kernel.org, kuba@kernel.org, Codrin Ciubotariu <codrin.ciubotariu@microchip.com>, davem@davemloft.net Subject: [PATCH net-next 3/7] net: macb: parse PHY nodes found under an MDIO node Date: Tue, 21 Jul 2020 13:02:30 +0300 [thread overview] Message-ID: <20200721100234.1302910-4-codrin.ciubotariu@microchip.com> (raw) In-Reply-To: <20200721100234.1302910-1-codrin.ciubotariu@microchip.com> The MACB embeds an MDIO bus controller. For this reason, the PHY nodes were represented as sub-nodes in the MACB node. Generally, the Ethernet controller is different than the MDIO controller, so the PHYs are probed by a separate MDIO driver. Since adding the PHY nodes directly under the ETH node became deprecated, we adjust the MACB driver to look for an MDIO node and register the subnode MDIO devices. Signed-off-by: Codrin Ciubotariu <codrin.ciubotariu@microchip.com> --- drivers/net/ethernet/cadence/macb_main.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 89fe7af5e408..66f02c16cc7c 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -740,10 +740,20 @@ static int macb_mii_probe(struct net_device *dev) static int macb_mdiobus_register(struct macb *bp) { struct device_node *child, *np = bp->pdev->dev.of_node; + struct device_node *mdio_node; + int ret; if (of_phy_is_fixed_link(np)) return mdiobus_register(bp->mii_bus); + /* if an MDIO node is present, it should contain the PHY nodes */ + mdio_node = of_get_child_by_name(np, "mdio"); + if (mdio_node) { + ret = of_mdiobus_register(bp->mii_bus, mdio_node); + of_node_put(mdio_node); + return ret; + } + /* Only create the PHY from the device tree if at least one PHY is * described. Otherwise scan the entire MDIO bus. We do this to support * old device tree that did not follow the best practices and did not @@ -755,7 +765,6 @@ static int macb_mdiobus_register(struct macb *bp) * decrement it before returning. */ of_node_put(child); - return of_mdiobus_register(bp->mii_bus, np); } -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-21 10:05 UTC|newest] Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-21 10:02 [PATCH net-next 0/7] Add an MDIO sub-node under MACB Codrin Ciubotariu 2020-07-21 10:02 ` Codrin Ciubotariu 2020-07-21 10:02 ` [PATCH net-next 1/7] net: macb: use device-managed devm_mdiobus_alloc() Codrin Ciubotariu 2020-07-21 10:02 ` Codrin Ciubotariu 2020-07-21 10:02 ` [PATCH net-next 2/7] macb: bindings doc: use an MDIO node as a container for PHY nodes Codrin Ciubotariu 2020-07-21 10:02 ` Codrin Ciubotariu 2020-07-21 13:29 ` Alexandre Belloni 2020-07-21 13:29 ` Alexandre Belloni 2020-07-21 13:44 ` Codrin.Ciubotariu 2020-07-21 13:44 ` Codrin.Ciubotariu 2020-07-21 10:02 ` Codrin Ciubotariu [this message] 2020-07-21 10:02 ` [PATCH net-next 3/7] net: macb: parse PHY nodes found under an MDIO node Codrin Ciubotariu 2020-07-21 13:36 ` Andrew Lunn 2020-07-21 13:36 ` Andrew Lunn 2020-07-21 13:40 ` Codrin.Ciubotariu 2020-07-21 13:40 ` Codrin.Ciubotariu 2020-07-21 13:42 ` Codrin.Ciubotariu 2020-07-21 13:42 ` Codrin.Ciubotariu 2020-07-21 13:44 ` Codrin.Ciubotariu 2020-07-21 13:44 ` Codrin.Ciubotariu 2020-07-21 10:02 ` [PATCH net-next 4/7] ARM: dts: at91: sama5d2: add an mdio sub-node to macb Codrin Ciubotariu 2020-07-21 10:02 ` Codrin Ciubotariu 2020-07-21 10:02 ` [PATCH net-next 5/7] ARM: dts: at91: sama5d3: " Codrin Ciubotariu 2020-07-21 10:02 ` Codrin Ciubotariu 2020-07-21 10:02 ` [PATCH net-next 6/7] ARM: dts: at91: sama5d4: " Codrin Ciubotariu 2020-07-21 10:02 ` Codrin Ciubotariu 2020-07-21 10:02 ` [PATCH net-next 7/7] ARM: dts: at91: sam9x60: " Codrin Ciubotariu 2020-07-21 10:02 ` Codrin Ciubotariu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200721100234.1302910-4-codrin.ciubotariu@microchip.com \ --to=codrin.ciubotariu@microchip.com \ --cc=alexandre.belloni@bootlin.com \ --cc=andrew@lunn.ch \ --cc=claudiu.beznea@microchip.com \ --cc=davem@davemloft.net \ --cc=devicetree@vger.kernel.org \ --cc=f.fainelli@gmail.com \ --cc=kuba@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=ludovic.desroches@microchip.com \ --cc=netdev@vger.kernel.org \ --cc=nicolas.ferre@microchip.com \ --cc=robh+dt@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.