From patchwork Thu Jan 6 07:13:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 77691 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 BA10BB70E0 for ; Thu, 6 Jan 2011 18:12:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754169Ab1AFHMF (ORCPT ); Thu, 6 Jan 2011 02:12:05 -0500 Received: from am1ehsobe004.messaging.microsoft.com ([213.199.154.207]:58502 "EHLO AM1EHSOBE004.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754030Ab1AFHMD (ORCPT ); Thu, 6 Jan 2011 02:12:03 -0500 Received: from mail8-am1-R.bigfish.com (10.3.201.242) by AM1EHSOBE004.bigfish.com (10.3.204.24) with Microsoft SMTP Server id 14.1.225.8; Thu, 6 Jan 2011 07:12:00 +0000 Received: from mail8-am1 (localhost.localdomain [127.0.0.1]) by mail8-am1-R.bigfish.com (Postfix) with ESMTP id 702C71B00269; Thu, 6 Jan 2011 07:12:00 +0000 (UTC) X-SpamScore: -3 X-BigFish: VS-3(zzbb2cKzz1202hzz8275bhz2dh2a8h668h62h) X-Spam-TCS-SCL: 1:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:az33egw02.freescale.net; RD:az33egw02.freescale.net; EFVD:NLI Received: from mail8-am1 (localhost.localdomain [127.0.0.1]) by mail8-am1 (MessageSwitch) id 1294297920224429_4283; Thu, 6 Jan 2011 07:12:00 +0000 (UTC) Received: from AM1EHSMHS005.bigfish.com (unknown [10.3.201.243]) by mail8-am1.bigfish.com (Postfix) with ESMTP id 30FCD1930050; Thu, 6 Jan 2011 07:12:00 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by AM1EHSMHS005.bigfish.com (10.3.207.105) with Microsoft SMTP Server (TLS) id 14.1.225.8; Thu, 6 Jan 2011 07:11:56 +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 p067BsPp029835; Thu, 6 Jan 2011 00:11:54 -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 p067BL5v014249; Thu, 6 Jan 2011 01:11:49 -0600 (CST) From: Shawn Guo To: , , , , , , , , , , , , , , , Subject: [PATCH v4 06/10] ARM: mx28: update clock and device name for dual fec support Date: Thu, 6 Jan 2011 15:13:14 +0800 Message-ID: <1294297998-26930-7-git-send-email-shawn.guo@freescale.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1294297998-26930-1-git-send-email-shawn.guo@freescale.com> References: <1294297998-26930-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 "imx28-fec", so that fec driver can distinguish mx28. Signed-off-by: Shawn Guo --- Changes for v4: - Use "imx28-fec" as fec device name 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..e2a8b0f 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("imx28-fec.0", NULL, fec_clk) + _REGISTER_CLOCK("imx28-fec.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..c42dff7 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("imx28-fec", data->id, res, ARRAY_SIZE(res), pdata, sizeof(*pdata)); }