On 02/24/2012 01:29 AM, Florian Fainelli wrote:
Le 02/23/12 20:19, David Daney a écrit :
From: David Daney<david.daney@xxxxxxxxxx>
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.
Cc: Florian Fainelli<florian@xxxxxxxxxxx>
Signed-off-by: David Daney<david.daney@xxxxxxxxxx>
Acked-by: Florian Fainelli <florian@xxxxxxxxxxx>
I would also add (and should have in the original post), that the commit
causing the regression was merged for 3.3. So if possible, it would be
nice to get this in before the final 3.3.
Thanks,
David Daney
---
drivers/staging/octeon/ethernet-mdio.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/octeon/ethernet-mdio.c
b/drivers/staging/octeon/ethernet-mdio.c
index 63800ba..e31949c 100644
--- 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_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);
