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

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

octeon: fix PHY name to match MDIO bus name 



Commit "d6c25beb: mdio-octeon: use an unique MDIO bus name" changed the
octeon MDIO bus name from "0" to "mdio-octeon-0", change the PHY
formatting logic to account for that name change, so that PHY connection
on this bus succeeds.

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

drivers/net/ethernet/octeon/octeon_mgmt.c

+2 −2
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ static void octeon_mgmt_adjust_link(struct net_device *netdev) 
static int octeon_mgmt_init_phy(struct net_device *netdev)

{

	struct octeon_mgmt *p = netdev_priv(netdev);

	char phy_id[20];

	char phy_id[MII_BUS_ID_SIZE + 3];



	if (octeon_is_simulation()) {

		/* No PHYs in the simulator. */
@@ -678,7 +678,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev) 
		return 0;

	}



	snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "0", p->port);

	snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "mdio-octeon-0", p->port);



	p->phydev = phy_connect(netdev, phy_id, octeon_mgmt_adjust_link, 0,

				PHY_INTERFACE_MODE_MII);