From: Shawn Guo <shawn.guo@freescale.com>
To: <davem@davemloft.net>, <gerg@snapgear.com>, <baruch@tkos.co.il>,
<eric@eukrea.com>, <bryan.wu@canonical.com>,
<r64343@freescale.com>, <B32542@freescale.com>,
<u.kleine-koenig@pengutro
Cc: Shawn Guo <shawn.guo@freescale.com>
Subject: [PATCH v3 06/10] ARM: mx28: update clock and device name for dual fec support
Date: Wed, 5 Jan 2011 22:07:33 +0800 [thread overview]
Message-ID: <1294236457-17476-7-git-send-email-shawn.guo@freescale.com> (raw)
In-Reply-To: <1294236457-17476-1-git-send-email-shawn.guo@freescale.com>
Change device name from "fec" to "enet-mac", so that fec driver
can distinguish ENET-MAC controller from FEC.
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---
Changes for v3:
- Change device name to "enet-mac"
arch/arm/mach-mxs/clock-mx28.c | 3 ++-
arch/arm/mach-mxs/devices/platform-fec.c | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c
index f20b254..933d3e6 100644
--- a/arch/arm/mach-mxs/clock-mx28.c
+++ b/arch/arm/mach-mxs/clock-mx28.c
@@ -606,7 +606,8 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK("duart", "apb_pclk", xbus_clk)
/* for amba-pl011 driver */
_REGISTER_CLOCK("duart", NULL, uart_clk)
- _REGISTER_CLOCK("fec.0", NULL, fec_clk)
+ _REGISTER_CLOCK("enet-mac.0", NULL, fec_clk)
+ _REGISTER_CLOCK("enet-mac.1", NULL, fec_clk)
_REGISTER_CLOCK("rtc", NULL, rtc_clk)
_REGISTER_CLOCK("pll2", NULL, pll2_clk)
_REGISTER_CLOCK(NULL, "hclk", hbus_clk)
diff --git a/arch/arm/mach-mxs/devices/platform-fec.c b/arch/arm/mach-mxs/devices/platform-fec.c
index c08168c..754bd83 100644
--- a/arch/arm/mach-mxs/devices/platform-fec.c
+++ b/arch/arm/mach-mxs/devices/platform-fec.c
@@ -45,6 +45,6 @@ struct platform_device *__init mxs_add_fec(
},
};
- return mxs_add_platform_device("fec", data->id,
+ return mxs_add_platform_device("enet-mac", data->id,
res, ARRAY_SIZE(res), pdata, sizeof(*pdata));
}
--
1.7.1
next prev parent reply other threads:[~2011-01-05 14:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-05 14:07 [PATCH v3 00/10] net/fec: add dual fec support for i.MX28 Shawn Guo
2011-01-05 14:07 ` [PATCH v3 01/10] net/fec: fix MMFR_OP type in fec_enet_mdio_write Shawn Guo
2011-01-05 14:07 ` [PATCH v3 02/10] net/fec: remove the use of "index" which is legacy Shawn Guo
2011-01-05 14:07 ` [PATCH v3 03/10] net/fec: add mac field into platform data and consolidate fec_get_mac Shawn Guo
2011-01-05 14:07 ` [PATCH v3 04/10] net/fec: improve pm for better suspend/resume Shawn Guo
2011-01-05 14:07 ` [PATCH v3 05/10] net/fec: add dual fec support for mx28 Shawn Guo
2011-01-05 16:34 ` Uwe Kleine-König
2011-01-06 4:14 ` Shawn Guo
2011-01-06 7:10 ` Uwe Kleine-König
2011-01-07 7:00 ` Shawn Guo
2011-01-07 9:44 ` Uwe Kleine-König
2011-01-05 14:07 ` Shawn Guo [this message]
2011-01-05 14:07 ` [PATCH v3 07/10] ARM: mx28: add the second fec device registration Shawn Guo
2011-01-05 14:07 ` [PATCH v3 08/10] ARM: mxs: add ocotp read function Shawn Guo
2011-01-05 16:16 ` Jamie Iles
2011-01-05 16:44 ` Uwe Kleine-König
2011-01-05 17:25 ` Jamie Iles
2011-01-05 17:56 ` Jamie Lokier
2011-01-05 18:35 ` Russell King - ARM Linux
2011-01-05 19:44 ` Jamie Lokier
2011-01-05 20:15 ` Russell King - ARM Linux
2011-01-06 0:50 ` Jamie Lokier
2011-01-06 9:13 ` Russell King - ARM Linux
2011-01-06 1:45 ` Shawn Guo
2011-01-05 14:07 ` [PATCH v3 09/10] ARM: mx28: read fec mac address from ocotp Shawn Guo
2011-01-05 14:07 ` [PATCH v3 10/10] ARM: mxs: add initial pm support Shawn Guo
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=1294236457-17476-7-git-send-email-shawn.guo@freescale.com \
--to=shawn.guo@freescale.com \
--cc=B32542@freescale.com \
--cc=baruch@tkos.co.il \
--cc=bryan.wu@canonical.com \
--cc=davem@davemloft.net \
--cc=eric@eukrea.com \
--cc=gerg@snapgear.com \
--cc=r64343@freescale.com \
--cc=u.kleine-koenig@pengutro \
/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).