linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: shawn.guo@freescale.com (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/10] ARM: mx28: add the second fec device registration
Date: Tue, 28 Dec 2010 22:55:52 +0800	[thread overview]
Message-ID: <1293548155-16328-8-git-send-email-shawn.guo@freescale.com> (raw)
In-Reply-To: <1293548155-16328-1-git-send-email-shawn.guo@freescale.com>

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---
 arch/arm/mach-mxs/mach-mx28evk.c |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index d162e95..def6519 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,10 @@ 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]);
+#ifdef CONFIG_FEC2
+	mx28_add_fec(1, &mx28_fec_pdata[1]);
+#endif
 }
 
 static void __init mx28evk_timer_init(void)
-- 
1.7.1

  parent reply	other threads:[~2010-12-28 14:55 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-12-28 14:55 [PATCH 00/10] net/fec: add dual fec support for i.MX28 Shawn Guo
2010-12-28 14:55 ` [PATCH 01/10] net/fec: fix MMFR_OP type in fec_enet_mdio_write Shawn Guo
2010-12-28 14:55 ` [PATCH 02/10] net/fec: remove the use of "index" which is legacy Shawn Guo
2010-12-28 14:55 ` [PATCH 03/10] net/fec: add mac field into platform data and consolidate fec_get_mac Shawn Guo
2010-12-29  5:29   ` Greg Ungerer
2010-12-29  9:51     ` Shawn Guo
2010-12-29  6:53   ` Baruch Siach
2010-12-29 10:05     ` Shawn Guo
2010-12-29 10:31       ` Uwe Kleine-König
2010-12-29 11:58         ` Shawn Guo
2010-12-29 12:42           ` Uwe Kleine-König
2010-12-30  2:12             ` Shawn Guo
2010-12-30  8:04               ` Uwe Kleine-König
2010-12-30  4:29       ` Shawn Guo
2010-12-30  5:29         ` Baruch Siach
2010-12-30  7:20           ` Shawn Guo
2010-12-29 10:30     ` Shawn Guo
2010-12-29 10:37       ` Uwe Kleine-König
2010-12-29 11:08         ` Shawn Guo
2010-12-29 11:10           ` Uwe Kleine-König
2010-12-29 12:00             ` Shawn Guo
2010-12-28 14:55 ` [PATCH 04/10] net/fec: improve pm for better suspend/resume Shawn Guo
2010-12-28 14:55 ` [PATCH 05/10] net/fec: add dual fec support for mx28 Shawn Guo
2010-12-28 14:55 ` [PATCH 06/10] ARM: mx28: update clocks for dual fec support Shawn Guo
2010-12-29  6:57   ` Baruch Siach
2010-12-29  8:10     ` Uwe Kleine-König
2010-12-29 10:14       ` Shawn Guo
2010-12-29 10:28         ` Uwe Kleine-König
2010-12-28 14:55 ` Shawn Guo [this message]
2010-12-29 10:50   ` [PATCH 07/10] ARM: mx28: add the second fec device registration Uwe Kleine-König
2010-12-29 12:05     ` Shawn Guo
2010-12-28 14:55 ` [PATCH 08/10] ARM: mxs: add ocotp read function Shawn Guo
2010-12-29 10:47   ` Uwe Kleine-König
2010-12-29 12:08     ` Shawn Guo
2010-12-29 13:47       ` Uwe Kleine-König
2010-12-29 11:22   ` Uwe Kleine-König
2010-12-30  5:50     ` Shawn Guo
2010-12-30  9:15       ` Uwe Kleine-König
2010-12-31  1:43         ` Shawn Guo
2010-12-31 16:11           ` Uwe Kleine-König
2011-01-01 13:03             ` Shawn Guo
2010-12-30  8:41     ` Shawn Guo
2010-12-30  9:02       ` Uwe Kleine-König
2010-12-31  1:46         ` Shawn Guo
2010-12-28 14:55 ` [PATCH 09/10] ARM: mx28: read fec mac address from ocotp Shawn Guo
2010-12-29 10:53   ` Uwe Kleine-König
2010-12-29 12:13     ` Shawn Guo
2010-12-29 12:45       ` Uwe Kleine-König
2010-12-30  2:19         ` Shawn Guo
2010-12-30  8:33         ` Shawn Guo
2010-12-28 14:55 ` [PATCH 10/10] ARM: mxs: add initial pm support Shawn Guo
2010-12-29 10:57   ` Uwe Kleine-König
2010-12-29 12:15     ` Shawn Guo
2010-12-30  8:50     ` Shawn Guo
2010-12-29  5:26 ` [PATCH 00/10] net/fec: add dual fec support for i.MX28 Greg Ungerer

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=1293548155-16328-8-git-send-email-shawn.guo@freescale.com \
    --to=shawn.guo@freescale.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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).