From patchwork Wed Jan 5 14:07:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 77602 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 0883FB7112 for ; Thu, 6 Jan 2011 01:06:35 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751529Ab1AEOG3 (ORCPT ); Wed, 5 Jan 2011 09:06:29 -0500 Received: from tx2ehsobe002.messaging.microsoft.com ([65.55.88.12]:36440 "EHLO TX2EHSOBE003.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751508Ab1AEOG2 (ORCPT ); Wed, 5 Jan 2011 09:06:28 -0500 Received: from mail87-tx2-R.bigfish.com (10.9.14.248) by TX2EHSOBE003.bigfish.com (10.9.40.23) with Microsoft SMTP Server id 14.1.225.8; Wed, 5 Jan 2011 14:06:28 +0000 Received: from mail87-tx2 (localhost.localdomain [127.0.0.1]) by mail87-tx2-R.bigfish.com (Postfix) with ESMTP id E4D021A904CF; Wed, 5 Jan 2011 14:06:27 +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:az33egw02.freescale.net; RD:az33egw02.freescale.net; EFVD:NLI Received: from mail87-tx2 (localhost.localdomain [127.0.0.1]) by mail87-tx2 (MessageSwitch) id 1294236387758681_20260; Wed, 5 Jan 2011 14:06:27 +0000 (UTC) Received: from TX2EHSMHS031.bigfish.com (unknown [10.9.14.241]) by mail87-tx2.bigfish.com (Postfix) with ESMTP id B3FD2768053; Wed, 5 Jan 2011 14:06:27 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by TX2EHSMHS031.bigfish.com (10.9.99.131) with Microsoft SMTP Server (TLS) id 14.1.225.8; Wed, 5 Jan 2011 14:06:25 +0000 Received: from az33smr01.freescale.net (az33smr01.freescale.net [10.64.34.199]) by az33egw02.freescale.net (8.14.3/8.14.3) with ESMTP id p05E6PaO003017; Wed, 5 Jan 2011 07:06:25 -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 p05E5olH010491; Wed, 5 Jan 2011 08:06:15 -0600 (CST) From: Shawn Guo To: , , , , , , , , , , , , CC: Shawn Guo Subject: [PATCH v3 06/10] ARM: mx28: update clock and device name for dual fec support Date: Wed, 5 Jan 2011 22:07:33 +0800 Message-ID: <1294236457-17476-7-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294236457-17476-1-git-send-email-shawn.guo@freescale.com> References: <1294236457-17476-1-git-send-email-shawn.guo@freescale.com> 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 Change device name from "fec" to "enet-mac", so that fec driver can distinguish ENET-MAC controller from FEC. Signed-off-by: Shawn Guo --- Changes for v3: - Change device name to "enet-mac" arch/arm/mach-mxs/clock-mx28.c | 3 ++- arch/arm/mach-mxs/devices/platform-fec.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c index f20b254..933d3e6 100644 --- a/arch/arm/mach-mxs/clock-mx28.c +++ b/arch/arm/mach-mxs/clock-mx28.c @@ -606,7 +606,8 @@ static struct clk_lookup lookups[] = { _REGISTER_CLOCK("duart", "apb_pclk", xbus_clk) /* for amba-pl011 driver */ _REGISTER_CLOCK("duart", NULL, uart_clk) - _REGISTER_CLOCK("fec.0", NULL, fec_clk) + _REGISTER_CLOCK("enet-mac.0", NULL, fec_clk) + _REGISTER_CLOCK("enet-mac.1", NULL, fec_clk) _REGISTER_CLOCK("rtc", NULL, rtc_clk) _REGISTER_CLOCK("pll2", NULL, pll2_clk) _REGISTER_CLOCK(NULL, "hclk", hbus_clk) diff --git a/arch/arm/mach-mxs/devices/platform-fec.c b/arch/arm/mach-mxs/devices/platform-fec.c index c08168c..754bd83 100644 --- a/arch/arm/mach-mxs/devices/platform-fec.c +++ b/arch/arm/mach-mxs/devices/platform-fec.c @@ -45,6 +45,6 @@ struct platform_device *__init mxs_add_fec( }, }; - return mxs_add_platform_device("fec", data->id, + return mxs_add_platform_device("enet-mac", data->id, res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); }