stmmac: fix phy naming inconsistency

Subsystems: networking drivers, stmmac ethernet driver, the rest

3 messages, 3 authors, 2012-01-24 · open the first message on its own page

stmmac: fix phy naming inconsistency

From: Alessandro Rubini <hidden>
Date: 2012-01-24 09:26:59

After commit "db8857b stmmac: use an unique MDIO bus name" my
device stopped being probed because two different names were being
used in different places. This fixes the inconsistency.

Signed-off-by: Alessandro Rubini <redacted>
Acked-by: Giancarlo Asnaghi <redacted>
Cc: Giuseppe Cavallaro <redacted>
Cc: Florian Fainelli <florian@openwrt.org>
---

Before the commit, the phy was identified like this and stuff worked:

     PHY ID 20005c90 at 1 IRQ 0 (506:01) active

After that commit, I get 

     PHY ID 20005c90 at 1 IRQ 0 (STMMAC MII Bus-1:01) active
     PHY stmmac-1:01 not found

In one place, "stmmac" is a static string, on the other the commit
used the name field of the bus that was "STMMAC MII Bus", so I changed
this older string to be nicer -- without spaces.

Maybe the name is available where "stmmac" is spelled out, but I
didn't check.

Now it works for me:

    eth1: PHY ID 20005c90 at 1 IRQ 0 (stmmac-1:01) active
    PHY: stmmac-1:01 - Link is Up - 100/Full


 drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 6e712c5..819606e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -154,7 +154,7 @@ int stmmac_mdio_register(struct net_device *ndev)
 	else
 		irqlist = priv->mii_irq;
 
-	new_bus->name = "STMMAC MII Bus";
+	new_bus->name = "stmmac";
 	new_bus->read = &stmmac_mdio_read;
 	new_bus->write = &stmmac_mdio_write;
 	new_bus->reset = &stmmac_mdio_reset;
-- 
1.7.7.2

Re: stmmac: fix phy naming inconsistency

From: Florian Fainelli <florian@openwrt.org>
Date: 2012-01-24 11:06:54

Hello Alessandro,

On 01/24/12 10:26, Alessandro Rubini wrote:
After commit "db8857b stmmac: use an unique MDIO bus name" my
device stopped being probed because two different names were being
used in different places. This fixes the inconsistency.

Signed-off-by: Alessandro Rubini<redacted>
Acked-by: Giancarlo Asnaghi<redacted>
Cc: Giuseppe Cavallaro<redacted>
Cc: Florian Fainelli<florian@openwrt.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
quoted hunk
---

Before the commit, the phy was identified like this and stuff worked:

      PHY ID 20005c90 at 1 IRQ 0 (506:01) active

After that commit, I get

      PHY ID 20005c90 at 1 IRQ 0 (STMMAC MII Bus-1:01) active
      PHY stmmac-1:01 not found

In one place, "stmmac" is a static string, on the other the commit
used the name field of the bus that was "STMMAC MII Bus", so I changed
this older string to be nicer -- without spaces.

Maybe the name is available where "stmmac" is spelled out, but I
didn't check.

Now it works for me:

     eth1: PHY ID 20005c90 at 1 IRQ 0 (stmmac-1:01) active
     PHY: stmmac-1:01 - Link is Up - 100/Full


  drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 6e712c5..819606e 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -154,7 +154,7 @@ int stmmac_mdio_register(struct net_device *ndev)
  	else
  		irqlist = priv->mii_irq;

-	new_bus->name = "STMMAC MII Bus";
+	new_bus->name = "stmmac";
  	new_bus->read =&stmmac_mdio_read;
  	new_bus->write =&stmmac_mdio_write;
  	new_bus->reset =&stmmac_mdio_reset;

Re: stmmac: fix phy naming inconsistency

From: David Miller <davem@davemloft.net>
Date: 2012-01-24 20:30:11

From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 24 Jan 2012 12:06:30 +0100
Hello Alessandro,

On 01/24/12 10:26, Alessandro Rubini wrote:
quoted
After commit "db8857b stmmac: use an unique MDIO bus name" my
device stopped being probed because two different names were being
used in different places. This fixes the inconsistency.

Signed-off-by: Alessandro Rubini<redacted>
Acked-by: Giancarlo Asnaghi<redacted>
Cc: Giuseppe Cavallaro<redacted>
Cc: Florian Fainelli<florian@openwrt.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
Applied, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help