From fdd90728c373e85c08cdd7356eab3767d6c525b9 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@freescale.com>
Date: Thu, 9 Dec 2010 23:12:47 +0800
Subject: [PATCH] --- yaml --- r: 226151 b: refs/heads/master c:
 b9a2ada8ff2ace20b1518a18872319d8619fe1ab h: refs/heads/master i:   226149:
 3a0a560012eff6842d470b76a5ba30333801ea05   226147:
 737c26b5afa4159c6f151a4ce734ba061498b6bc   226143:
 449f82f3da17894d458d05f802b008af2d3e4f17 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-mxs/devices-mx28.h        |  4 ++
 .../arch/arm/mach-mxs/devices/platform-fec.c  | 50 +++++++++++++++++++
 .../mach-mxs/include/mach/devices-common.h    | 12 +++++
 4 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 trunk/arch/arm/mach-mxs/devices/platform-fec.c

diff --git a/[refs] b/[refs]
index e83795406929..fbd1499e755e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc38ad4052a50b9e73fdcc970ecdd4f69ee9d97a
+refs/heads/master: b9a2ada8ff2ace20b1518a18872319d8619fe1ab
diff --git a/trunk/arch/arm/mach-mxs/devices-mx28.h b/trunk/arch/arm/mach-mxs/devices-mx28.h
index 47c2f0408ec3..00b736c434ba 100644
--- a/trunk/arch/arm/mach-mxs/devices-mx28.h
+++ b/trunk/arch/arm/mach-mxs/devices-mx28.h
@@ -14,3 +14,7 @@
 extern const struct mxs_duart_data mx28_duart_data __initconst;
 #define mx28_add_duart() \
 	mxs_add_duart(&mx28_duart_data)
+
+extern const struct mxs_fec_data mx28_fec_data[] __initconst;
+#define mx28_add_fec(id, pdata) \
+	mxs_add_fec(&mx28_fec_data[id], pdata)
diff --git a/trunk/arch/arm/mach-mxs/devices/platform-fec.c b/trunk/arch/arm/mach-mxs/devices/platform-fec.c
new file mode 100644
index 000000000000..c08168cf3dec
--- /dev/null
+++ b/trunk/arch/arm/mach-mxs/devices/platform-fec.c
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2010 Pengutronix
+ * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation.
+ */
+#include <asm/sizes.h>
+#include <mach/mx28.h>
+#include <mach/devices-common.h>
+
+#define mxs_fec_data_entry_single(soc, _id)				\
+	{								\
+		.id = _id,						\
+		.iobase = soc ## _ENET_MAC ## _id ## _BASE_ADDR,	\
+		.irq = soc ## _INT_ENET_MAC ## _id,			\
+	}
+
+#define mxs_fec_data_entry(soc, _id)					\
+	[_id] = mxs_fec_data_entry_single(soc, _id)
+
+#ifdef CONFIG_SOC_IMX28
+const struct mxs_fec_data mx28_fec_data[] __initconst = {
+#define mx28_fec_data_entry(_id)					\
+	mxs_fec_data_entry(MX28, _id)
+	mx28_fec_data_entry(0),
+	mx28_fec_data_entry(1),
+};
+#endif
+
+struct platform_device *__init mxs_add_fec(
+		const struct mxs_fec_data *data,
+		const struct fec_platform_data *pdata)
+{
+	struct resource res[] = {
+		{
+			.start = data->iobase,
+			.end = data->iobase + SZ_16K - 1,
+			.flags = IORESOURCE_MEM,
+		}, {
+			.start = data->irq,
+			.end = data->irq,
+			.flags = IORESOURCE_IRQ,
+		},
+	};
+
+	return mxs_add_platform_device("fec", data->id,
+			res, ARRAY_SIZE(res), pdata, sizeof(*pdata));
+}
diff --git a/trunk/arch/arm/mach-mxs/include/mach/devices-common.h b/trunk/arch/arm/mach-mxs/include/mach/devices-common.h
index 07b44392cfd3..3da48d4d3273 100644
--- a/trunk/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/trunk/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -32,3 +32,15 @@ struct mxs_duart_data {
 };
 struct platform_device *__init mxs_add_duart(
 		const struct mxs_duart_data *data);
+
+/* fec */
+#include <linux/fec.h>
+struct mxs_fec_data {
+	int id;
+	resource_size_t iobase;
+	resource_size_t iosize;
+	resource_size_t irq;
+};
+struct platform_device *__init mxs_add_fec(
+		const struct mxs_fec_data *data,
+		const struct fec_platform_data *pdata);