From: Shawn Guo <shawn.guo@freescale.com>
To: <davem@davemloft.net>, <gerg@snapgear.com>, <baruch@tkos.co.il>,
<eric@eukrea.com>, <bryan.wu@canonical.com>,
<r64343@freescale.com>, <B32542@freescale.com>,
<lw@karo-electronics.de>,
Cc: Shawn Guo <shawn.guo@freescale.com>
Subject: [PATCH] ARM: mxs: pass fec device name via platform data
Date: Fri, 14 Jan 2011 14:53:20 +0800 [thread overview]
Message-ID: <1294988000-20232-1-git-send-email-shawn.guo@freescale.com> (raw)
In-Reply-To: <20110113150622.GV24920@pengutronix.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---
arch/arm/mach-mxs/devices/platform-fec.c | 11 ++++++-----
arch/arm/mach-mxs/include/mach/devices-common.h | 1 +
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-mxs/devices/platform-fec.c b/arch/arm/mach-mxs/devices/platform-fec.c
index c42dff7..75eb26b 100644
--- a/arch/arm/mach-mxs/devices/platform-fec.c
+++ b/arch/arm/mach-mxs/devices/platform-fec.c
@@ -10,20 +10,21 @@
#include <mach/mx28.h>
#include <mach/devices-common.h>
-#define mxs_fec_data_entry_single(soc, _id) \
+#define mxs_fec_data_entry_single(soc, _devid, _id) \
{ \
+ .devid = _devid, \
.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)
+#define mxs_fec_data_entry(soc, _devid, _id) \
+ [_id] = mxs_fec_data_entry_single(soc, _devid, _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)
+ mxs_fec_data_entry(MX28, "imx28-fec", _id)
mx28_fec_data_entry(0),
mx28_fec_data_entry(1),
};
@@ -45,6 +46,6 @@ struct platform_device *__init mxs_add_fec(
},
};
- return mxs_add_platform_device("imx28-fec", data->id,
+ return mxs_add_platform_device(data->devid, 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 6c3d1a1..10fbcfd 100644
--- a/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -33,6 +33,7 @@ int __init mxs_add_duart(const struct amba_device *dev);
/* fec */
#include <linux/fec.h>
struct mxs_fec_data {
+ const char *devid;
int id;
resource_size_t iobase;
resource_size_t iosize;
--
1.7.1
next prev parent reply other threads:[~2011-01-14 6:50 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 ` Shawn Guo [this message]
2011-01-14 8:38 ` [PATCH] ARM: mxs: pass fec device name via platform data 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 ` [PATCH v5] ARM: mx28: add the second fec device registration Shawn Guo
2011-01-13 14:49 ` 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=1294988000-20232-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=lw@karo-electronics.de \
--cc=r64343@freescale.com \
/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).