From patchwork Thu Jan 6 07:13:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 77694 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 D917BB713B for ; Thu, 6 Jan 2011 18:12:19 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754218Ab1AFHMN (ORCPT ); Thu, 6 Jan 2011 02:12:13 -0500 Received: from am1ehsobe001.messaging.microsoft.com ([213.199.154.204]:10480 "EHLO AM1EHSOBE001.bigfish.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754195Ab1AFHML (ORCPT ); Thu, 6 Jan 2011 02:12:11 -0500 Received: from mail11-am1-R.bigfish.com (10.3.201.254) by AM1EHSOBE001.bigfish.com (10.3.204.21) with Microsoft SMTP Server id 14.1.225.8; Thu, 6 Jan 2011 07:12:10 +0000 Received: from mail11-am1 (localhost.localdomain [127.0.0.1]) by mail11-am1-R.bigfish.com (Postfix) with ESMTP id 0693FF30242; Thu, 6 Jan 2011 07:12:10 +0000 (UTC) X-SpamScore: -5 X-BigFish: VS-5(zzbb2cK9370Jzz1202hzz8275bhz2dh2a8h668h62h) 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 mail11-am1 (localhost.localdomain [127.0.0.1]) by mail11-am1 (MessageSwitch) id 1294297929766615_32684; Thu, 6 Jan 2011 07:12:09 +0000 (UTC) Received: from AM1EHSMHS009.bigfish.com (unknown [10.3.201.240]) by mail11-am1.bigfish.com (Postfix) with ESMTP id A9FDC2B0050; Thu, 6 Jan 2011 07:12:09 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by AM1EHSMHS009.bigfish.com (10.3.207.109) with Microsoft SMTP Server (TLS) id 14.1.225.8; Thu, 6 Jan 2011 07:12:09 +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 p067C7iP029873; Thu, 6 Jan 2011 00:12:07 -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 p067BL60014249; Thu, 6 Jan 2011 01:12:02 -0600 (CST) From: Shawn Guo To: , , , , , , , , , , , , , , , Subject: [PATCH v4 09/10] ARM: mx28: read fec mac address from ocotp Date: Thu, 6 Jan 2011 15:13:17 +0800 Message-ID: <1294297998-26930-10-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 Read fec mac address from ocotp and save it into fec_platform_data mac field for fec driver to use. Signed-off-by: Shawn Guo --- Changes for v2: - It's not necessary to remove "const" for fec_platform_data from platform-fec.c and devices-common.h, so add it back. - Hard-coding Freescale OUI (00:04:9f) instead of just the first two two octets. - Correct the return of mx28evk_fec_get_mac() and check it with caller arch/arm/mach-mxs/mach-mx28evk.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c index def6519..54fa512 100644 --- a/arch/arm/mach-mxs/mach-mx28evk.c +++ b/arch/arm/mach-mxs/mach-mx28evk.c @@ -129,12 +129,44 @@ static struct fec_platform_data mx28_fec_pdata[] = { }, }; +static int __init mx28evk_fec_get_mac(void) +{ + int i, ret; + u32 val; + + /* + * OCOTP only stores the last 4 octets for each mac address, + * so hard-code Freescale OUI (00:04:9f) here. + */ + for (i = 0; i < 2; i++) { + ret = mxs_read_ocotp(0x20 + i * 0x10, 1, &val); + if (ret) + goto error; + + mx28_fec_pdata[i].mac[0] = 0x00; + mx28_fec_pdata[i].mac[1] = 0x04; + mx28_fec_pdata[i].mac[2] = 0x9f; + mx28_fec_pdata[i].mac[3] = (val >> 16) & 0xff; + mx28_fec_pdata[i].mac[4] = (val >> 8) & 0xff; + mx28_fec_pdata[i].mac[5] = (val >> 0) & 0xff; + } + + return 0; + +error: + pr_err("%s: timeout when reading fec mac from OCOTP\n", __func__); + return ret; +} + static void __init mx28evk_init(void) { mxs_iomux_setup_multiple_pads(mx28evk_pads, ARRAY_SIZE(mx28evk_pads)); mx28_add_duart(); + if (mx28evk_fec_get_mac()) + pr_warn("%s: failed on fec mac setup\n", __func__); + mx28evk_fec_reset(); mx28_add_fec(0, &mx28_fec_pdata[0]); #ifdef CONFIG_FEC2