From: Shawn Guo <shawn.guo@freescale.com>
To: <s.hauer@pengutronix.de>, <davem@davemloft.net>,
<gerg@snapgear.com>, <baruch@tkos.co.il>, <eric@eukrea.com>,
<bryan.wu@canonical.com>, <r64343@freescale.com>,
<B32542@freescale.com>,
Cc: Shawn Guo <shawn.guo@freescale.com>
Subject: [PATCH v5] ARM: mx28: add the second fec device registration
Date: Tue, 11 Jan 2011 20:09:24 +0800 [thread overview]
Message-ID: <1294747764-4499-1-git-send-email-shawn.guo@freescale.com> (raw)
In-Reply-To: <1294297998-26930-1-git-send-email-shawn.guo@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---
Changes for v5:
- Do not use CONFIG_FEC2 which is a fec driver configration
arch/arm/mach-mxs/mach-mx28evk.c | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index d162e95..8e2c597 100644
--- a/arch/arm/mach-mxs/mach-mx28evk.c
+++ b/arch/arm/mach-mxs/mach-mx28evk.c
@@ -57,6 +57,19 @@ static const iomux_cfg_t mx28evk_pads[] __initconst = {
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
MX28_PAD_ENET_CLK__CLKCTRL_ENET |
(MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+ /* fec1 */
+ MX28_PAD_ENET0_CRS__ENET1_RX_EN |
+ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+ MX28_PAD_ENET0_RXD2__ENET1_RXD0 |
+ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+ MX28_PAD_ENET0_RXD3__ENET1_RXD1 |
+ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+ MX28_PAD_ENET0_COL__ENET1_TX_EN |
+ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+ MX28_PAD_ENET0_TXD2__ENET1_TXD0 |
+ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
+ MX28_PAD_ENET0_TXD3__ENET1_TXD1 |
+ (MXS_PAD_8MA | MXS_PAD_3V3 | MXS_PAD_PULLUP),
/* phy power line */
MX28_PAD_SSP1_DATA3__GPIO_2_15 |
(MXS_PAD_4MA | MXS_PAD_3V3 | MXS_PAD_NOPULL),
@@ -106,8 +119,14 @@ static void __init mx28evk_fec_reset(void)
gpio_set_value(MX28EVK_FEC_PHY_RESET, 1);
}
-static const struct fec_platform_data mx28_fec_pdata __initconst = {
- .phy = PHY_INTERFACE_MODE_RMII,
+static struct fec_platform_data mx28_fec_pdata[] = {
+ {
+ /* fec0 */
+ .phy = PHY_INTERFACE_MODE_RMII,
+ }, {
+ /* fec1 */
+ .phy = PHY_INTERFACE_MODE_RMII,
+ },
};
static void __init mx28evk_init(void)
@@ -117,7 +136,8 @@ static void __init mx28evk_init(void)
mx28_add_duart();
mx28evk_fec_reset();
- mx28_add_fec(0, &mx28_fec_pdata);
+ mx28_add_fec(0, &mx28_fec_pdata[0]);
+ mx28_add_fec(1, &mx28_fec_pdata[1]);
}
static void __init mx28evk_timer_init(void)
--
1.7.1
next prev parent reply other threads:[~2011-01-11 12:07 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-06 7:13 [PATCH v4 00/10] net/fec: add dual fec support for i.MX28 Shawn Guo
2011-01-06 7:13 ` [PATCH v4 01/10] net/fec: fix MMFR_OP type in fec_enet_mdio_write Shawn Guo
2011-01-06 7:13 ` [PATCH v4 02/10] net/fec: remove the use of "index" which is legacy Shawn Guo
2011-01-06 7:13 ` [PATCH v4 03/10] net/fec: add mac field into platform data and consolidate fec_get_mac Shawn Guo
2011-01-06 7:13 ` [PATCH v4 04/10] net/fec: improve pm for better suspend/resume Shawn Guo
2011-01-06 7:13 ` [PATCH v4 05/10] net/fec: add dual fec support for mx28 Shawn Guo
2011-01-11 10:27 ` Sascha Hauer
2011-01-11 11:38 ` Shawn Guo
2011-01-11 12:24 ` Greg Ungerer
2011-01-11 13:07 ` Uwe Kleine-König
2011-01-11 13:25 ` Greg Ungerer
2011-01-12 7:42 ` Uwe Kleine-König
2011-01-13 14:48 ` Uwe Kleine-König
2011-01-14 5:48 ` Shawn Guo
2011-01-14 7:52 ` Uwe Kleine-König
2011-01-14 13:08 ` Shawn Guo
2011-01-17 8:16 ` Lothar Waßmann
2011-01-17 8:42 ` Uwe Kleine-König
2011-01-17 11:52 ` Shawn Guo
2011-01-17 9:06 ` Uwe Kleine-König
2011-01-13 21:06 ` Uwe Kleine-König
2011-01-06 7:13 ` [PATCH v4 06/10] ARM: mx28: update clock and device name for dual fec support Shawn Guo
2011-01-13 15:06 ` Uwe Kleine-König
2011-01-14 6:46 ` Shawn Guo
2011-01-14 6:53 ` [PATCH] ARM: mxs: pass fec device name via platform data Shawn Guo
2011-01-14 8:38 ` Uwe Kleine-König
2011-01-06 7:13 ` [PATCH v4 07/10] ARM: mx28: add the second fec device registration Shawn Guo
2011-01-11 10:29 ` Sascha Hauer
2011-01-11 11:39 ` Shawn Guo
2011-01-11 11:44 ` Sascha Hauer
2011-01-06 7:13 ` [PATCH v4 08/10] ARM: mxs: add ocotp read function Shawn Guo
2011-01-11 13:31 ` Sascha Hauer
2011-01-11 14:05 ` Uwe Kleine-König
2011-01-12 6:47 ` Shawn Guo
2011-01-12 14:50 ` Sascha Hauer
2011-01-12 16:01 ` Uwe Kleine-König
2011-01-13 1:55 ` Shawn Guo
2011-01-13 15:19 ` Uwe Kleine-König
2011-01-14 8:33 ` Sascha Hauer
2011-01-14 13:16 ` Shawn Guo
2011-01-19 10:48 ` Shawn Guo
2011-01-06 7:13 ` [PATCH v4 09/10] ARM: mx28: read fec mac address from ocotp Shawn Guo
2011-01-13 14:50 ` Uwe Kleine-König
2011-01-06 7:13 ` [PATCH v4 10/10] ARM: mxs: add initial pm support Shawn Guo
2011-01-09 23:44 ` [PATCH v4 00/10] net/fec: add dual fec support for i.MX28 David Miller
2011-01-10 3:08 ` Shawn Guo
2011-01-11 8:15 ` Shawn Guo
2011-01-11 12:07 ` [PATCH] net/fec: remove config FEC2 as it's used nowhere Shawn Guo
2011-01-11 22:03 ` David Miller
2011-01-11 12:09 ` Shawn Guo [this message]
2011-01-13 14:49 ` [PATCH v5] ARM: mx28: add the second fec device registration Uwe Kleine-König
2011-01-14 7:04 ` Shawn Guo
2011-01-14 7:24 ` [PATCH v5 08/10] ARM: mxs: add ocotp read function Shawn Guo
2011-01-14 8:40 ` Sascha Hauer
2011-01-14 9:48 ` Uwe Kleine-König
2011-01-14 8:42 ` Uwe Kleine-König
2011-01-14 7:25 ` [PATCH v5 09/10] ARM: mxs/mx28evk: read fec mac address from ocotp Shawn Guo
2011-01-14 15:11 ` [PATCH v6 08/10] ARM: mxs: add ocotp read function Shawn Guo
2011-01-24 9:05 ` [PATCH v5] 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=1294747764-4499-1-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=s.hauer@pengutronix.de \
/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).