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

Commit ae092b5b authored by David Rivshin's avatar David Rivshin Committed by David S. Miller
Browse files

drivers: net: cpsw: don't ignore phy-mode if phy-handle is used 



The phy-mode emac property was only being processed in the phy_id
or fixed-link cases. However if phy-handle was specified instead,
an error message would complain about the lack of phy_id or
fixed-link, and then jump past the of_get_phy_mode(). This would
result in the PHY mode defaulting to MII, regardless of what the
devicetree specified.

Fixes: 9e42f715 ("drivers: net: cpsw: add phy-handle parsing")
Signed-off-by: default avatarDavid Rivshin <drivshin@allworx.com>
Tested-by: default avatarNicolas Chauvet <kwizart@gmail.com>
Tested-by: default avatarAndrew Goodbody <andrew.goodbody@cambrionix.com>
Reviewed-by: default avatarMugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d733f754

drivers/net/ethernet/ti/cpsw.c

+8 −2
Original line number Diff line number Diff line
@@ -2043,7 +2043,11 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, 
		slave_data->phy_node = of_parse_phandle(slave_node,

							"phy-handle", 0);

		parp = of_get_property(slave_node, "phy_id", &lenp);

		if (of_phy_is_fixed_link(slave_node)) {

		if (slave_data->phy_node) {

			dev_dbg(&pdev->dev,

				"slave[%d] using phy-handle=\"%s\"\n",

				i, slave_data->phy_node->full_name);

		} else if (of_phy_is_fixed_link(slave_node)) {

			struct device_node *phy_node;

			struct phy_device *phy_dev;
@@ -2080,7 +2084,9 @@ 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);

		} else {

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

			dev_err(&pdev->dev,

				"No slave[%d] phy_id, phy-handle, or fixed-link property\n",

				i);

			goto no_phy_slave;

		}

		slave_data->phy_if = of_get_phy_mode(slave_node);