]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ethernet: ti: am65-cpsw: Fix fwnode passed to phylink_create()
authorSiddharth Vadapalli <s-vadapalli@ti.com>
Tue, 24 May 2022 06:25:58 +0000 (11:55 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jun 2022 16:44:53 +0000 (18:44 +0200)
[ Upstream commit 0b7180072a9df5e18af5b58410fec38230848a8d ]

am65-cpsw-nuss driver incorrectly uses fwnode member of common
ethernet device's "struct device_node" instead of using fwnode
member of the port's "struct device_node" in phylink_create().
This results in all ports having the same phy data when there
are multiple ports with their phy properties populated in their
respective nodes rather than the common ethernet device node.

Fix it here by using fwnode member of the port's node.

Fixes: e8609e69470f ("net: ethernet: ti: am65-cpsw: Convert to PHYLINK")
Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
Link: https://lore.kernel.org/r/20220524062558.19296-1-s-vadapalli@ti.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/ti/am65-cpsw-nuss.c

index d2747e9db286df8955250d7c5df00b96934ae3f8..98969070ed4b2e033ab88e8dfeee54f1fb90d772 100644 (file)
@@ -9,6 +9,7 @@
 #include <linux/etherdevice.h>
 #include <linux/if_vlan.h>
 #include <linux/interrupt.h>
+#include <linux/irqdomain.h>
 #include <linux/kernel.h>
 #include <linux/kmemleak.h>
 #include <linux/module.h>
@@ -1989,7 +1990,9 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx)
 
        phy_interface_set_rgmii(port->slave.phylink_config.supported_interfaces);
 
-       phylink = phylink_create(&port->slave.phylink_config, dev->fwnode, port->slave.phy_if,
+       phylink = phylink_create(&port->slave.phylink_config,
+                                of_node_to_fwnode(port->slave.phy_node),
+                                port->slave.phy_if,
                                 &am65_cpsw_phylink_mac_ops);
        if (IS_ERR(phylink))
                return PTR_ERR(phylink);