On 02/24/2012 12:04 PM, [email protected] wrote:
This is a note to let you know that I've just added the patch titled
staging/octeon: Fix PHY binding in octeon-ethernet driver.
to my staging git tree
Thanks.
[...]
The patch will also will be merged in the next major kernel release
during the merge window.
If you have any questions about this process, please let me know.
Well I understand the process as far as that goes.
However I think it should be merged to v3.3 before it is realeased. The
commit causing the regression, d6c25be (mdio-octeon: use an unique MDIO
bus name.), was merged to v3.3, so it makes some sense to merge this fix
before the final v3.3.
David Daney
From b5c19ca8014aa5151712274d5e70c3666a8918c1 Mon Sep 17 00:00:00 2001
From: David Daney<[email protected]>
Date: Thu, 23 Feb 2012 11:19:31 -0800
Subject: staging/octeon: Fix PHY binding in octeon-ethernet driver.
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<[email protected]>
Acked-by: Florian Fainelli<[email protected]>
Cc: stable<[email protected]>
Signed-off-by: Greg Kroah-Hartman<[email protected]>
---
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);
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
