From 861c1cb545dcbd13e0643bee1483d58e3e673459 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Mon, 26 Jan 2009 17:26:02 +0100
Subject: [PATCH] --- yaml --- r: 137224 b: refs/heads/master c:
 879fea1b486d2b6fa399c40b8aed172b0dfdedb9 h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/arch/arm/mach-mx2/devices.c | 20 ++++++++++++++++++++
 trunk/arch/arm/mach-mx2/devices.h |  1 +
 trunk/arch/arm/mach-mx2/mx27ads.c |  1 +
 trunk/arch/arm/mach-mx2/pcm038.c  |  1 +
 5 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 175eac026e7d..cde70e1566e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe7316bff119a11e68f895ecf9a5a713ed30004c
+refs/heads/master: 879fea1b486d2b6fa399c40b8aed172b0dfdedb9
diff --git a/trunk/arch/arm/mach-mx2/devices.c b/trunk/arch/arm/mach-mx2/devices.c
index 07061e644545..684d5d92c2e4 100644
--- a/trunk/arch/arm/mach-mx2/devices.c
+++ b/trunk/arch/arm/mach-mx2/devices.c
@@ -258,7 +258,27 @@ struct platform_device mxc_fb_device = {
 		.coherent_dma_mask = 0xFFFFFFFF,
 	},
 };
+#endif
 
+#ifdef CONFIG_MACH_MX27
+static struct resource mxc_fec_resources[] = {
+	{
+		.start	= FEC_BASE_ADDR,
+		.end	= FEC_BASE_ADDR + 0xfff,
+		.flags	= IORESOURCE_MEM
+	}, {
+		.start	= MXC_INT_FEC,
+		.end	= MXC_INT_FEC,
+		.flags	= IORESOURCE_IRQ
+	},
+};
+
+struct platform_device mxc_fec_device = {
+	.name = "fec",
+	.id = 0,
+	.num_resources = ARRAY_SIZE(mxc_fec_resources),
+	.resource = mxc_fec_resources,
+};
 #endif
 
 /* GPIO port description */
diff --git a/trunk/arch/arm/mach-mx2/devices.h b/trunk/arch/arm/mach-mx2/devices.h
index f4cb0ce29f13..d85d5b26c986 100644
--- a/trunk/arch/arm/mach-mx2/devices.h
+++ b/trunk/arch/arm/mach-mx2/devices.h
@@ -14,3 +14,4 @@ extern struct platform_device mxc_uart_device5;
 extern struct platform_device mxc_w1_master_device;
 extern struct platform_device mxc_nand_device;
 extern struct platform_device mxc_fb_device;
+extern struct platform_device mxc_fec_device;
diff --git a/trunk/arch/arm/mach-mx2/mx27ads.c b/trunk/arch/arm/mach-mx2/mx27ads.c
index 3c967f460b30..4a3b097adc12 100644
--- a/trunk/arch/arm/mach-mx2/mx27ads.c
+++ b/trunk/arch/arm/mach-mx2/mx27ads.c
@@ -180,6 +180,7 @@ static int uart_mxc_port5_exit(struct platform_device *pdev)
 
 static struct platform_device *platform_devices[] __initdata = {
 	&mx27ads_nor_mtd_device,
+	&mxc_fec_device,
 };
 
 static int mxc_fec_pins[] = {
diff --git a/trunk/arch/arm/mach-mx2/pcm038.c b/trunk/arch/arm/mach-mx2/pcm038.c
index 58552a01c0d3..d246eb1bb3ce 100644
--- a/trunk/arch/arm/mach-mx2/pcm038.c
+++ b/trunk/arch/arm/mach-mx2/pcm038.c
@@ -191,6 +191,7 @@ static struct mxc_nand_platform_data pcm038_nand_board_info = {
 static struct platform_device *platform_devices[] __initdata = {
 	&pcm038_nor_mtd_device,
 	&mxc_w1_master_device,
+	&mxc_fec_device,
 	&pcm038_sram_mtd_device,
 };