Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47276fcc authored by Mugunthan V N's avatar Mugunthan V N Committed by David S. Miller
Browse files

drivers: net:cpsw: fix probe_dt when only slave 1 is pinned out 



when slave 0 has no phy and slave 1 connected to phy, driver probe will
fail as there is no phy id present for slave 0 device tree, so continuing
even though no phy-id found, also moving mac-id read later to ensure
mac-id is read from device tree even when phy-id entry in not found.

Signed-off-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 25946f20

drivers/net/ethernet/ti/cpsw.c

+9 −9
Original line number Diff line number Diff line
@@ -2006,7 +2006,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, 
		parp = of_get_property(slave_node, "phy_id", &lenp);

		if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) {

			dev_err(&pdev->dev, "Missing slave[%d] phy_id property\n", i);

			return -EINVAL;

			goto no_phy_slave;

		}

		mdio_node = of_find_node_by_phandle(be32_to_cpup(parp));

		phyid = be32_to_cpup(parp+1);
@@ -2019,6 +2019,14 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, 
		snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),

			 PHY_ID_FMT, mdio->name, phyid);



		slave_data->phy_if = of_get_phy_mode(slave_node);

		if (slave_data->phy_if < 0) {

			dev_err(&pdev->dev, "Missing or malformed slave[%d] phy-mode property\n",

				i);

			return slave_data->phy_if;

		}



no_phy_slave:

		mac_addr = of_get_mac_address(slave_node);

		if (mac_addr) {

			memcpy(slave_data->mac_addr, mac_addr, ETH_ALEN);
@@ -2030,14 +2038,6 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, 
					return ret;

			}

		}



		slave_data->phy_if = of_get_phy_mode(slave_node);

		if (slave_data->phy_if < 0) {

			dev_err(&pdev->dev, "Missing or malformed slave[%d] phy-mode property\n",

				i);

			return slave_data->phy_if;

		}



		if (data->dual_emac) {

			if (of_property_read_u32(slave_node, "dual_emac_res_vlan",

						 &prop)) {