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

octeon: fix PHY name to match MDIO bus name

Commit "d6c25be: 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
...@@ -670,7 +670,7 @@ static void octeon_mgmt_adjust_link(struct net_device *netdev) ...@@ -670,7 +670,7 @@ static void octeon_mgmt_adjust_link(struct net_device *netdev)
static int octeon_mgmt_init_phy(struct net_device *netdev) static int octeon_mgmt_init_phy(struct net_device *netdev)
{ {
struct octeon_mgmt *p = netdev_priv(netdev); struct octeon_mgmt *p = netdev_priv(netdev);
char phy_id[20]; char phy_id[MII_BUS_ID_SIZE + 3];
if (octeon_is_simulation()) { if (octeon_is_simulation()) {
/* No PHYs in the simulator. */ /* No PHYs in the simulator. */
...@@ -678,7 +678,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev) ...@@ -678,7 +678,7 @@ static int octeon_mgmt_init_phy(struct net_device *netdev)
return 0; 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, p->phydev = phy_connect(netdev, phy_id, octeon_mgmt_adjust_link, 0,
PHY_INTERFACE_MODE_MII); PHY_INTERFACE_MODE_MII);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment