From: Florian Fainelli <florian@openwrt.org>
To: netdev@vger.kernel.org
Cc: Florian Fainelli <florian@openwrt.org>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 14/21] stmmac: use an unique MDIO bus name.
Date: Tue, 10 Jan 2012 10:59:20 +0100 [thread overview]
Message-ID: <1326189567-21663-15-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1326189567-21663-1-git-send-email-florian@openwrt.org>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 3738b47..f884d67 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -307,7 +307,7 @@ static int stmmac_init_phy(struct net_device *dev)
priv->speed = 0;
priv->oldduplex = -1;
- snprintf(bus_id, MII_BUS_ID_SIZE, "%x", priv->plat->bus_id);
+ snprintf(bus_id, MII_BUS_ID_SIZE, "stmmac-%x", priv->plat->bus_id);
snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, bus_id,
priv->plat->phy_addr);
pr_debug("stmmac_init_phy: trying to attach to %s\n", phy_id);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
index 51f4412..da4a104 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
@@ -158,7 +158,8 @@ int stmmac_mdio_register(struct net_device *ndev)
new_bus->read = &stmmac_mdio_read;
new_bus->write = &stmmac_mdio_write;
new_bus->reset = &stmmac_mdio_reset;
- snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", mdio_bus_data->bus_id);
+ snprintf(new_bus->id, MII_BUS_ID_SIZE, "%s-%x",
+ new_bus->name, mdio_bus_data->bus_id);
new_bus->priv = ndev;
new_bus->irq = irqlist;
new_bus->phy_mask = mdio_bus_data->phy_mask;
--
1.7.5.4
next prev parent reply other threads:[~2012-01-10 10:09 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1326189567-21663-1-git-send-email-florian@openwrt.org>
2012-01-10 9:59 ` [PATCH 01/21] ax88796: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 02/21] bfin_mac: " Florian Fainelli
2012-01-11 14:47 ` Bob Liu
2012-01-10 9:59 ` [PATCH 03/21] au1000-eth: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 04/21] sb1250: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 05/21] macb: " Florian Fainelli
2012-01-10 10:01 ` Nicolas Ferre
2012-01-10 9:59 ` [PATCH 06/21] dnet: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 07/21] fec: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 08/21] lantiq_etop: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 09/21] mv643xx-eth: " Florian Fainelli
2012-01-10 10:02 ` Lennert Buytenhek
2012-01-10 9:59 ` [PATCH 10/21] pxa168-eth: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 11/21] sh-eth: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 12/21] s6gmac: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 13/21] smsc911x: " Florian Fainelli
2012-01-10 9:59 ` Florian Fainelli [this message]
2012-01-10 9:59 ` [PATCH 15/21] cpmac: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 16/21] davinci_emac: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 17/21] ixp4xx-eth: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 18/21] bcm63xx_enet: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 19/21] phy/fixed: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 20/21] mdio-gpio: " Florian Fainelli
2012-01-10 9:59 ` [PATCH 21/21] mdio-octeon: " Florian Fainelli
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=1326189567-21663-15-git-send-email-florian@openwrt.org \
--to=florian@openwrt.org \
--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
all inboxes | Powered by JetHome®