| From b5c19ca8014aa5151712274d5e70c3666a8918c1 Mon Sep 17 00:00:00 2001 |
| From: David Daney <david.daney@cavium.com> |
| Date: Thu, 23 Feb 2012 11:19:31 -0800 |
| Subject: staging/octeon: Fix PHY binding in octeon-ethernet driver. |
| |
| From: David Daney <david.daney@cavium.com> |
| |
| commit b5c19ca8014aa5151712274d5e70c3666a8918c1 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/staging/octeon/ethernet-mdio.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/drivers/staging/octeon/ethernet-mdio.c |
| +++ b/drivers/staging/octeon/ethernet-mdio.c |
| @@ -164,9 +164,9 @@ int cvm_oct_phy_setup_device(struct net_ |
| |
| 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); |
