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

Commit a19c5d68 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

cpmac: fix PHY name to match MDIO bus name 



Commit d1733f07: cpmac: use an unique MDIO bus name changed the MDIO bus
name from "1" to "cpmac-1", this breaks the PHY connection logic because
the PHY name still uses the old bus names "0" and "1", fix that to
always use the mdio bus id instead.

Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 758ff235

drivers/net/ethernet/ti/cpmac.c

+2 −2
Original line number Diff line number Diff line
@@ -1122,7 +1122,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) 
	pdata = pdev->dev.platform_data;



	if (external_switch || dumb_switch) {

		strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */

		strncpy(mdio_bus_id, "fixed-0", MII_BUS_ID_SIZE); /* fixed phys bus */

		phy_id = pdev->id;

	} else {

		for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
@@ -1138,7 +1138,7 @@ static int __devinit cpmac_probe(struct platform_device *pdev) 
	if (phy_id == PHY_MAX_ADDR) {

		dev_err(&pdev->dev, "no PHY present, falling back "

					"to switch on MDIO bus 0\n");

		strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */

		strncpy(mdio_bus_id, "fixed-0", MII_BUS_ID_SIZE); /* fixed phys bus */

		phy_id = pdev->id;

	}