From patchwork Tue Jan 31 12:07:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Hui X-Patchwork-Id: 6468 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id E30CD23E92 for ; Tue, 31 Jan 2012 11:56:54 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id C5D59A18380 for ; Tue, 31 Jan 2012 11:56:54 +0000 (UTC) Received: by bkar19 with SMTP id r19so5458867bka.11 for ; Tue, 31 Jan 2012 03:56:54 -0800 (PST) Received: by 10.205.139.12 with SMTP id iu12mr10354536bkc.2.1328011014464; Tue, 31 Jan 2012 03:56:54 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.204.130.220 with SMTP id u28cs178704bks; Tue, 31 Jan 2012 03:56:54 -0800 (PST) Received: by 10.68.210.12 with SMTP id mq12mr49485281pbc.2.1328011013032; Tue, 31 Jan 2012 03:56:53 -0800 (PST) Received: from TX2EHSOBE007.bigfish.com (tx2ehsobe004.messaging.microsoft.com. [65.55.88.14]) by mx.google.com with ESMTPS id e8si26143272pbw.105.2012.01.31.03.56.52 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jan 2012 03:56:53 -0800 (PST) Received-SPF: neutral (google.com: 65.55.88.14 is neither permitted nor denied by best guess record for domain of jason.hui@linaro.org) client-ip=65.55.88.14; Authentication-Results: mx.google.com; spf=neutral (google.com: 65.55.88.14 is neither permitted nor denied by best guess record for domain of jason.hui@linaro.org) smtp.mail=jason.hui@linaro.org Received: from mail169-tx2-R.bigfish.com (10.9.14.237) by TX2EHSOBE007.bigfish.com (10.9.40.27) with Microsoft SMTP Server id 14.1.225.23; Tue, 31 Jan 2012 11:56:50 +0000 Received: from mail169-tx2 (localhost [127.0.0.1]) by mail169-tx2-R.bigfish.com (Postfix) with ESMTP id 009742002BE; Tue, 31 Jan 2012 11:56:51 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275dhz2dhc1bhc31hc1ah87h2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-DOMAIN-IP-MATCH: fail Received: from mail169-tx2 (localhost.localdomain [127.0.0.1]) by mail169-tx2 (MessageSwitch) id 1328011008578591_18627; Tue, 31 Jan 2012 11:56:48 +0000 (UTC) Received: from TX2EHSMHS034.bigfish.com (unknown [10.9.14.246]) by mail169-tx2.bigfish.com (Postfix) with ESMTP id 889D8180048; Tue, 31 Jan 2012 11:56:48 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by TX2EHSMHS034.bigfish.com (10.9.99.134) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 31 Jan 2012 11:56:47 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server id 14.1.355.3; Tue, 31 Jan 2012 05:56:46 -0600 Received: from r64343-desktop.ap.freescale.net (r64343-desktop.ap.freescale.net [10.192.242.36]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id q0VBuiXt021022; Tue, 31 Jan 2012 05:56:45 -0600 (CST) From: Jason Liu To: CC: Subject: [PATCH] i.mx: i.mx5: update imx_get_mac_from_fuse function Date: Tue, 31 Jan 2012 20:07:29 +0800 Message-ID: <1328011649-14230-1-git-send-email-jason.hui@linaro.org> X-Mailer: git-send-email 1.7.4.1 MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com FEC does not work on the i.mx51/53evk board, it will hangup In: serial Out: serial Err: serial Net: After bisect, it due to the following commit: be252b6 net: imx: Add multi-FEC support for imx_get_mac_from_fuse has change the imx_get_mac_from_fuse fucntion prototype, but fail to update i.mx5, here it does it. After apply this patch, u-boot works again on i.mx51/53 evk boards. Signed-off-by: Jason Liu Cc: Stefano Babic --- arch/arm/cpu/armv7/mx5/soc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/cpu/armv7/mx5/soc.c b/arch/arm/cpu/armv7/mx5/soc.c index 1533dd8..3f5a4f7 100644 --- a/arch/arm/cpu/armv7/mx5/soc.c +++ b/arch/arm/cpu/armv7/mx5/soc.c @@ -72,7 +72,7 @@ u32 get_cpu_rev(void) } #if defined(CONFIG_FEC_MXC) -void imx_get_mac_from_fuse(unsigned char *mac) +void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) { int i; struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE;