Commit 337d1727 authored by Marek Vasut's avatar Marek Vasut Committed by David S. Miller
Browse files

net: ethernet: ti: cpsw: Assign OF node to slave devices 



Assign OF node to CPSW slave devices, otherwise it is not possible to
bind e.g. DSA switch to them. Without this patch, the DSA code tries
to find the ethernet device by OF match, but fails to do so because
the slave device has NULL OF node.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: David S. Miller <davem@davemloft.net>
Cc: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c3d310d

drivers/net/ethernet/ti/cpsw.c

+3 −0
Original line number Diff line number Diff line
@@ -2179,6 +2179,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, 
			return ret;

		}



		slave_data->slave_node = slave_node;

		slave_data->phy_node = of_parse_phandle(slave_node,

							"phy-handle", 0);

		parp = of_get_property(slave_node, "phy_id", &lenp);
@@ -2330,6 +2331,7 @@ static int cpsw_probe_dual_emac(struct cpsw_priv *priv) 


	/* register the network device */

	SET_NETDEV_DEV(ndev, cpsw->dev);

	ndev->dev.of_node = cpsw->slaves[1].data->slave_node;

	ret = register_netdev(ndev);

	if (ret)

		dev_err(cpsw->dev, "cpsw: error registering net device\n");
@@ -2507,6 +2509,7 @@ static int cpsw_probe(struct platform_device *pdev) 


	/* register the network device */

	SET_NETDEV_DEV(ndev, dev);

	ndev->dev.of_node = cpsw->slaves[0].data->slave_node;

	ret = register_netdev(ndev);

	if (ret) {

		dev_err(dev, "error registering net device\n");

drivers/net/ethernet/ti/cpsw_priv.h

+1 −0
Original line number Diff line number Diff line
@@ -272,6 +272,7 @@ struct cpsw_host_regs { 
};



struct cpsw_slave_data {

	struct device_node *slave_node;

	struct device_node *phy_node;

	char		phy_id[MII_BUS_ID_SIZE];

	int		phy_if;

CRA Git | Maintained and supported by SUSTech CRA and CCSE