From: shawn.guo@freescale.com (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 12/15] ARM: mxs: Dynamically allocate fec devices
Date: Thu, 9 Dec 2010 23:12:47 +0800 [thread overview]
Message-ID: <1291907569-8925-12-git-send-email-shawn.guo@freescale.com> (raw)
In-Reply-To: <1290754154-9428-1-git-send-email-shawn.guo@freescale.com>
Dynamically allocate fec devices for MX28, which gets dual
fec interface.
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---
Changes for v3:
- Change inclusion of hardware.h to mx28.h
Changes for v2:
- Remove the use of mx28_add_fec0 and mx28_add_fec1
- Remove unnessary passing of data->iosize
arch/arm/mach-mxs/devices-mx28.h | 4 ++
arch/arm/mach-mxs/devices/platform-fec.c | 50 +++++++++++++++++++++++
arch/arm/mach-mxs/include/mach/devices-common.h | 12 +++++
3 files changed, 66 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-mxs/devices/platform-fec.c
diff --git a/arch/arm/mach-mxs/devices-mx28.h b/arch/arm/mach-mxs/devices-mx28.h
index 47c2f04..00b736c 100644
--- a/arch/arm/mach-mxs/devices-mx28.h
+++ b/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/arch/arm/mach-mxs/devices/platform-fec.c b/arch/arm/mach-mxs/devices/platform-fec.c
new file mode 100644
index 0000000..c08168c
--- /dev/null
+++ b/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/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h
index 07b4439..3da48d4 100644
--- a/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/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);
--
1.7.1
next prev parent reply other threads:[~2010-12-09 15:12 UTC|newest]
Thread overview: 146+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-26 6:48 [PATCH 00/15] ARM: mxs: Add initial support for MX23 and MX28 Shawn Guo
2010-11-26 6:49 ` [PATCH 01/15] ARM: mxs: Add core definitions Shawn Guo
2010-11-26 11:30 ` Uwe Kleine-König
2010-11-29 7:21 ` Shawn Guo
2010-11-26 6:49 ` [PATCH 02/15] ARM: mxs: Add helper definition and function Shawn Guo
2010-11-26 6:49 ` [PATCH 03/15] ARM: mxs: Add reset routines Shawn Guo
2010-11-26 9:31 ` Lothar Waßmann
2010-11-26 9:57 ` Uwe Kleine-König
2010-11-26 10:38 ` Lothar Waßmann
2010-11-26 11:32 ` Uwe Kleine-König
2010-11-26 12:53 ` Lothar Waßmann
2010-11-29 9:25 ` [PATCH] prevent 'BUG: sleeping function called from invalid context' in arch_reset() Lothar Waßmann
2010-11-29 9:58 ` Uwe Kleine-König
2010-12-06 16:13 ` Uwe Kleine-König
2010-11-26 14:16 ` [PATCH 03/15] ARM: mxs: Add reset routines Xinyu Chen
2010-11-26 14:38 ` Lothar Waßmann
2010-11-26 6:49 ` [PATCH 04/15] ARM: mxs: Add interrupt support Shawn Guo
2010-11-30 13:56 ` Uwe Kleine-König
2010-11-30 17:02 ` Russell King - ARM Linux
2010-12-01 11:23 ` Shawn Guo
2010-11-26 6:49 ` [PATCH 05/15] ARM: mxs: Add low-level debug UART support Shawn Guo
2010-11-30 15:48 ` Uwe Kleine-König
2010-11-26 6:49 ` [PATCH 06/15] ARM: mxs: Add timer support Shawn Guo
2010-11-30 16:13 ` Uwe Kleine-König
2010-12-02 14:44 ` Shawn Guo
2010-12-02 15:20 ` Thomas Gleixner
2010-12-02 16:48 ` Uwe Kleine-König
2010-11-26 6:49 ` [PATCH 07/15] ARM: mxs: Add gpio support Shawn Guo
2010-11-30 16:21 ` Uwe Kleine-König
2010-11-26 6:49 ` [PATCH 08/15] ARM: mxs: Add iomux support Shawn Guo
2010-11-30 16:32 ` Uwe Kleine-König
2010-11-26 6:49 ` [PATCH 09/15] ARM: mxs: Add clock support Shawn Guo
2010-11-30 16:39 ` Uwe Kleine-König
2010-12-07 13:09 ` Shawn Guo
2010-12-07 13:33 ` Uwe Kleine-König
2010-12-07 13:53 ` Shawn Guo
2010-12-02 15:07 ` Uwe Kleine-König
2010-12-03 5:07 ` Shawn Guo
2010-11-26 6:49 ` [PATCH 10/15] ARM: mxs: Add static memory mapping Shawn Guo
2010-11-26 6:49 ` [PATCH 11/15] ARM: mxs: Dynamically allocate duart devices Shawn Guo
2010-11-26 6:49 ` [PATCH 12/15] ARM: mxs: Dynamically allocate fec devices Shawn Guo
2010-11-30 20:01 ` Uwe Kleine-König
2010-11-26 6:49 ` [PATCH 13/15] ARM: mxs: Add initial mx23evk support Shawn Guo
2010-11-30 20:02 ` Uwe Kleine-König
2010-11-26 6:49 ` [PATCH 14/15] ARM: mxs: Add initial mx28evk support Shawn Guo
2010-11-30 20:06 ` Uwe Kleine-König
2010-11-26 6:49 ` [PATCH 15/15] ARM: mxs: Add build configuration for mxs Shawn Guo
2010-11-30 20:08 ` Uwe Kleine-König
2010-11-29 11:59 ` [PATCH v2 01/15] ARM: mxs: Add core definitions Shawn Guo
2010-11-30 9:21 ` Uwe Kleine-König
2010-11-29 11:59 ` [PATCH v2 02/15] ARM: mxs: Add helper definition and function Shawn Guo
2010-11-29 11:59 ` [PATCH v2 03/15] ARM: mxs: Add reset routines Shawn Guo
2010-11-30 10:25 ` Uwe Kleine-König
2010-12-01 10:45 ` Shawn Guo
2010-12-01 10:59 ` Uwe Kleine-König
2010-12-01 11:34 ` Shawn Guo
2010-12-02 6:02 ` Shawn Guo
2010-12-02 7:27 ` Uwe Kleine-König
2010-12-02 9:40 ` Uwe Kleine-König
2010-12-02 10:16 ` Shawn Guo
2010-11-29 11:59 ` [PATCH v2 06/15] ARM: mxs: Add timer support Shawn Guo
2010-11-29 11:59 ` [PATCH v2 10/15] ARM: mxs: Add static memory mapping Shawn Guo
2010-11-29 11:59 ` [PATCH v2 15/15] ARM: mxs: Add build configuration for mxs Shawn Guo
2010-12-07 16:31 ` [PATCH v3 01/15] ARM: mxs: Add core definitions Shawn Guo
2010-12-07 20:18 ` Uwe Kleine-König
2010-12-08 4:50 ` Shawn Guo
2010-12-08 9:17 ` Uwe Kleine-König
2010-12-07 16:31 ` [PATCH v3 03/15] ARM: mxs: Add reset routines Shawn Guo
2010-12-07 20:27 ` Uwe Kleine-König
2010-12-08 7:33 ` Lothar Waßmann
2010-12-08 20:31 ` Uwe Kleine-König
2010-12-09 8:51 ` Shawn Guo
2010-12-09 8:55 ` Uwe Kleine-König
2010-12-07 16:31 ` [PATCH v2 04/15] ARM: mxs: Add interrupt support Shawn Guo
2010-12-07 21:03 ` Uwe Kleine-König
2010-12-08 8:27 ` Shawn Guo
2010-12-08 9:39 ` Uwe Kleine-König
2010-12-08 10:46 ` Shawn Guo
2010-12-08 12:09 ` Uwe Kleine-König
2010-12-08 12:31 ` Shawn Guo
2010-12-08 8:56 ` Shawn Guo
2010-12-08 9:14 ` Uwe Kleine-König
2010-12-08 8:24 ` Lothar Waßmann
2010-12-07 16:31 ` [PATCH v2 05/15] ARM: mxs: Add low-level debug UART support Shawn Guo
2010-12-08 20:27 ` Uwe Kleine-König
2010-12-09 2:02 ` Shawn Guo
2010-12-09 8:42 ` Uwe Kleine-König
2010-12-07 16:31 ` [PATCH v3 06/15] ARM: mxs: Add timer support Shawn Guo
2010-12-07 21:18 ` Uwe Kleine-König
2010-12-08 5:58 ` Shawn Guo
2010-12-08 9:25 ` Uwe Kleine-König
2010-12-08 8:30 ` Lothar Waßmann
2010-12-08 9:31 ` Uwe Kleine-König
2010-12-07 16:31 ` [PATCH v2 07/15] ARM: mxs: Add gpio support Shawn Guo
2010-12-08 7:21 ` Lothar Waßmann
2010-12-07 16:31 ` [PATCH v2 08/15] ARM: mxs: Add iomux support Shawn Guo
2010-12-08 7:25 ` Lothar Waßmann
2010-12-08 10:52 ` Shawn Guo
2010-12-08 10:56 ` Uwe Kleine-König
2010-12-08 11:29 ` Shawn Guo
2010-12-08 11:32 ` Lothar Waßmann
2010-12-09 6:15 ` Shawn Guo
2010-12-09 8:43 ` Uwe Kleine-König
2010-12-07 16:31 ` [PATCH v2 09/15] ARM: mxs: Add clock support Shawn Guo
2010-12-08 20:57 ` Uwe Kleine-König
2010-12-09 1:44 ` Shawn Guo
2010-12-09 8:41 ` Uwe Kleine-König
2010-12-09 10:04 ` Shawn Guo
2010-12-09 10:30 ` Shawn Guo
2010-12-07 16:32 ` [PATCH v2 12/15] ARM: mxs: Dynamically allocate fec devices Shawn Guo
2010-12-07 16:32 ` [PATCH v2 13/15] ARM: mxs: Add initial mx23evk support Shawn Guo
2010-12-07 16:32 ` [PATCH v2 14/15] ARM: mxs: Add initial mx28evk support Shawn Guo
2010-12-08 20:28 ` Uwe Kleine-König
2010-12-09 7:04 ` Shawn Guo
2010-12-09 8:32 ` Uwe Kleine-König
2010-12-09 9:03 ` Shawn Guo
2010-12-09 9:37 ` Uwe Kleine-König
2010-12-09 10:17 ` Shawn Guo
2010-12-09 12:27 ` Lothar Waßmann
2010-12-09 13:38 ` Shawn Guo
2010-12-09 13:54 ` Shawn Guo
2010-12-07 16:32 ` [PATCH v3 15/15] ARM: mxs: Add build configuration for mxs Shawn Guo
2010-12-10 14:51 ` Uwe Kleine-König
2010-12-10 15:05 ` Shawn Guo
2010-12-09 15:12 ` [PATCH v4 01/15] ARM: mxs: Add core definitions Shawn Guo
2010-12-09 17:37 ` Russell King - ARM Linux
2010-12-09 15:12 ` [PATCH v3 02/15] ARM: mxs: Add helper definition and function Shawn Guo
2010-12-09 15:12 ` [PATCH v4 03/15] ARM: mxs: Add reset routines Shawn Guo
2010-12-09 15:12 ` [PATCH v3 04/15] ARM: mxs: Add interrupt support Shawn Guo
2010-12-09 15:12 ` [PATCH v3 05/15] ARM: mxs: Add low-level debug UART support Shawn Guo
2010-12-09 15:12 ` [PATCH v4 06/15] ARM: mxs: Add timer support Shawn Guo
2010-12-09 15:12 ` [PATCH v3 07/15] ARM: mxs: Add gpio support Shawn Guo
2010-12-09 16:47 ` Lothar Waßmann
2010-12-10 7:06 ` Shawn Guo
2010-12-10 7:23 ` Shawn Guo
2010-12-10 8:11 ` Uwe Kleine-König
2010-12-10 15:32 ` Shawn Guo
2010-12-09 15:12 ` [PATCH v3 08/15] ARM: mxs: Add iomux support Shawn Guo
2010-12-09 16:12 ` Lothar Waßmann
2010-12-09 15:12 ` [PATCH v3 09/15] ARM: mxs: Add clock support Shawn Guo
2010-12-09 21:11 ` Uwe Kleine-König
2010-12-09 15:12 ` [PATCH v2 10/15] ARM: mxs: Add static memory mapping Shawn Guo
2010-12-09 15:12 ` [PATCH v2 11/15] ARM: mxs: Dynamically allocate duart devices Shawn Guo
2010-12-09 15:12 ` Shawn Guo [this message]
2010-12-09 15:12 ` [PATCH v3 13/15] ARM: mxs: Add initial mx23evk support Shawn Guo
2010-12-09 15:12 ` [PATCH v3 14/15] ARM: mxs: Add initial mx28evk 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=1291907569-8925-12-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).