Commit 78269025 authored by Alexander Sverdlin's avatar Alexander Sverdlin Committed by Jakub Kicinski
Browse files

net: ethernet: ti: am65-cpsw-nuss: rename phy_node -> port_np 



Rename phy_node to port_np to better reflect what it actually is,
because the new phylink API takes netdev node (or DSA port node),
and resolves the phandle internally.

Signed-off-by: default avatarAlexander Sverdlin <alexander.sverdlin@siemens.com>
Link: https://lore.kernel.org/r/20240528075954.3608118-2-alexander.sverdlin@siemens.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0f4b437b

drivers/net/ethernet/ti/am65-cpsw-nuss.c

+3 −3
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev) 
	/* mac_sl should be configured via phy-link interface */

	am65_cpsw_sl_ctl_reset(port);



	ret = phylink_of_phy_connect(port->slave.phylink, port->slave.phy_node, 0);

	ret = phylink_of_phy_connect(port->slave.phylink, port->slave.port_np, 0);

	if (ret)

		goto error_cleanup;
@@ -2611,7 +2611,7 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common) 
				of_property_read_bool(port_np, "ti,mac-only");



		/* get phy/link info */

		port->slave.phy_node = port_np;

		port->slave.port_np = port_np;

		ret = of_get_phy_mode(port_np, &port->slave.phy_if);

		if (ret) {

			dev_err(dev, "%pOF read phy-mode err %d\n",
@@ -2760,7 +2760,7 @@ am65_cpsw_nuss_init_port_ndev(struct am65_cpsw_common *common, u32 port_idx) 
	}



	phylink = phylink_create(&port->slave.phylink_config,

				 of_node_to_fwnode(port->slave.phy_node),

				 of_node_to_fwnode(port->slave.port_np),

				 port->slave.phy_if,

				 &am65_cpsw_phylink_mac_ops);

	if (IS_ERR(phylink))

drivers/net/ethernet/ti/am65-cpsw-nuss.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct am65_cpts; 
struct am65_cpsw_slave_data {

	bool				mac_only;

	struct cpsw_sl			*mac_sl;

	struct device_node		*phy_node;

	struct device_node		*port_np;

	phy_interface_t			phy_if;

	struct phy			*ifphy;

	struct phy			*serdes_phy;