From patchwork Fri Jan 14 06:53:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 78863 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D01A5B7043 for ; Fri, 14 Jan 2011 17:50:47 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753959Ab1ANGud (ORCPT ); Fri, 14 Jan 2011 01:50:33 -0500 Received: from va3ehsobe006.messaging.microsoft.com ([216.32.180.16]:20006 "EHLO VA3EHSOBE009.bigfish.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753725Ab1ANGua (ORCPT ); Fri, 14 Jan 2011 01:50:30 -0500 Received: from mail153-va3-R.bigfish.com (10.7.14.242) by VA3EHSOBE009.bigfish.com (10.7.40.29) with Microsoft SMTP Server id 14.1.225.8; Fri, 14 Jan 2011 06:50:29 +0000 Received: from mail153-va3 (localhost.localdomain [127.0.0.1]) by mail153-va3-R.bigfish.com (Postfix) with ESMTP id 5C36719F005F; Fri, 14 Jan 2011 06:50:29 +0000 (UTC) X-SpamScore: -3 X-BigFish: VS-3(zzbb2cKzz1202hzz8275bhz2dh2a8h668h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:de01egw01.freescale.net; RD:de01egw01.freescale.net; EFVD:NLI Received: from mail153-va3 (localhost.localdomain [127.0.0.1]) by mail153-va3 (MessageSwitch) id 1294987829131400_25249; Fri, 14 Jan 2011 06:50:29 +0000 (UTC) Received: from VA3EHSMHS009.bigfish.com (unknown [10.7.14.239]) by mail153-va3.bigfish.com (Postfix) with ESMTP id AE2C28C0054; Fri, 14 Jan 2011 06:50:27 +0000 (UTC) Received: from de01egw01.freescale.net (192.88.165.102) by VA3EHSMHS009.bigfish.com (10.7.99.19) with Microsoft SMTP Server (TLS) id 14.1.225.8; Fri, 14 Jan 2011 06:50:27 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by de01egw01.freescale.net (8.14.3/8.14.3) with ESMTP id p0E6oQpF024410; Thu, 13 Jan 2011 23:50:26 -0700 (MST) Received: from ubuntu.ap.freescale.net (ubuntu-010192242196.ap.freescale.net [10.192.242.196]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id p0E6oL9N026437; Fri, 14 Jan 2011 00:50:21 -0600 (CST) From: Shawn Guo To: , , , , , , , , , , , , , CC: Shawn Guo Subject: [PATCH] ARM: mxs: pass fec device name via platform data Date: Fri, 14 Jan 2011 14:53:20 +0800 Message-ID: <1294988000-20232-1-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <20110113150622.GV24920@pengutronix.de> References: <20110113150622.GV24920@pengutronix.de> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Shawn Guo Acked-by: Uwe Kleine-König --- 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 #include -#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 struct mxs_fec_data { + const char *devid; int id; resource_size_t iobase; resource_size_t iosize;