From: Alessandro Rubini <rubini@gnudd.com>
To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc: giancarlo.asnaghi@st.com, peppe.cavallaro@st.com, florian@openwrt.org
Subject: stmmac: fix phy naming inconsistency
Date: Tue, 24 Jan 2012 10:26:48 +0100 [thread overview]
Message-ID: <20120124092648.GA26380@mail.gnudd.com> (raw)
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 <rubini@gnudd.com>
Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com>
Cc: Giuseppe Cavallaro <peppe.cavallaro@st.com>
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
next reply other threads:[~2012-01-24 9:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-24 9:26 Alessandro Rubini [this message]
2012-01-24 11:06 ` stmmac: fix phy naming inconsistency Florian Fainelli
2012-01-24 20:29 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120124092648.GA26380@mail.gnudd.com \
--to=rubini@gnudd.com \
--cc=florian@openwrt.org \
--cc=giancarlo.asnaghi@st.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).