Skip to content

Commit

Permalink
staging/octeon: Fix PHY binding in octeon-ethernet driver.
Browse files Browse the repository at this point in the history
Commit d6c25be (mdio-octeon: use an unique MDIO bus name.) changed the
names used to refer to MDIO buses.  The ethernet driver must be
changed to match, so that the PHY drivers can be attached.

Signed-off-by: David Daney <david.daney@cavium.com>
Acked-by: Florian Fainelli <florian@openwrt.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
David Daney authored and Greg Kroah-Hartman committed Feb 24, 2012
1 parent 47de87a commit b5c19ca
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/staging/octeon/ethernet-mdio.c
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ int cvm_oct_phy_setup_device(struct net_device *dev)

int phy_addr = cvmx_helper_board_get_mii_address(priv->port);
if (phy_addr != -1) {
char phy_id[20];
char phy_id[MII_BUS_ID_SIZE + 3];

snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "0", phy_addr);
snprintf(phy_id, sizeof(phy_id), PHY_ID_FMT, "mdio-octeon-0", phy_addr);

priv->phydev = phy_connect(dev, phy_id, cvm_oct_adjust_link, 0,
PHY_INTERFACE_MODE_GMII);
Expand Down

0 comments on commit b5c19ca

Please sign in to comment.