From patchwork Tue May 8 13:21:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 8469 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 04D3B23E20 for ; Tue, 8 May 2012 13:21:40 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id BF891A18823 for ; Tue, 8 May 2012 13:21:39 +0000 (UTC) Received: by gglu1 with SMTP id u1so1906106ggl.11 for ; Tue, 08 May 2012 06:21:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :x-spamscore:x-bigfish:x-forefront-antispam-report:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:x-originatororg:x-gm-message-state; bh=Flrzf5S/TL0jvoFN9GizqnxSJTrWKZ+kB5z0JTk2IB8=; b=NJ6Gi+AYpDuKZyUzt9iqEoFkPmc5nqSSXU+6WtRNrlH+F62voPUqAUmkDckUkmNQ7X X02PHCZ5KiwanwiQ1dBtrbxogADKEIjdd+ucJXf7tnNEj/04XabA9DtN3+89bR2FrbUP H4PrsxAXeYqjcEHocd1T1BxfxTyMtN27NavtBmlcN6gcJlLp49hyQrMpoOmm+ux0dx4U SPl+9xyHzbiTIkzQKzFTwZMd9zT8oldT1HMa8F/gt6PgjkU98ufG6RNiAObAPmxr0kxk f+3CxyEFcUm0Usv7Mh+Hcy9IQUQDn3cjtfBDZYhJTbl0afAcmF34UUqWMS+lf4KrnmGk CZjA== Received: by 10.50.181.164 with SMTP id dx4mr10907431igc.1.1336483299097; Tue, 08 May 2012 06:21:39 -0700 (PDT) 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.231.73.147 with SMTP id q19csp198692ibj; Tue, 8 May 2012 06:21:38 -0700 (PDT) Received: by 10.50.95.167 with SMTP id dl7mr10595199igb.6.1336483297855; Tue, 08 May 2012 06:21:37 -0700 (PDT) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe006.messaging.microsoft.com. [216.32.181.186]) by mx.google.com with ESMTPS id b7si19431962icw.67.2012.05.08.06.21.37 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 08 May 2012 06:21:37 -0700 (PDT) Received-SPF: neutral (google.com: 216.32.181.186 is neither permitted nor denied by best guess record for domain of B20223@freescale.com) client-ip=216.32.181.186; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.181.186 is neither permitted nor denied by best guess record for domain of B20223@freescale.com) smtp.mail=B20223@freescale.com Received: from mail60-ch1-R.bigfish.com (10.43.68.248) by CH1EHSOBE002.bigfish.com (10.43.70.52) with Microsoft SMTP Server id 14.1.225.23; Tue, 8 May 2012 13:21:23 +0000 Received: from mail60-ch1 (localhost [127.0.0.1]) by mail60-ch1-R.bigfish.com (Postfix) with ESMTP id E36173C0755; Tue, 8 May 2012 13:21:22 +0000 (UTC) X-SpamScore: 3 X-BigFish: VS3(zcb8kzzz1202hzz8275bhz2dh2a8h668h839hd24he5bh) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail60-ch1 (localhost.localdomain [127.0.0.1]) by mail60-ch1 (MessageSwitch) id 1336483271178_31003; Tue, 8 May 2012 13:21:10 +0000 (UTC) Received: from CH1EHSMHS001.bigfish.com (snatpool3.int.messaging.microsoft.com [10.43.68.225]) by mail60-ch1.bigfish.com (Postfix) with ESMTP id EDCBE4C0385; Tue, 8 May 2012 13:21:10 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS001.bigfish.com (10.43.70.1) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 8 May 2012 13:21:09 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server id 14.1.355.3; Tue, 8 May 2012 08:21:22 -0500 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id q48DLImm006467; Tue, 8 May 2012 08:21:19 -0500 (CDT) From: Richard Zhao To: CC: , , Richard Zhao Subject: [PATCH] ARM: imx6q: make ksz9021rn_phy_fixup depends on config of FEC Date: Tue, 8 May 2012 21:21:15 +0800 Message-ID: <1336483275-8610-1-git-send-email-richard.zhao@freescale.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1336478520.23308.36.camel@sauron.fi.intel.com> References: <1336478520.23308.36.camel@sauron.fi.intel.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-Gm-Message-State: ALoCoQnfSYjSm6ZpzaRdzIar5rM4hFxshEaedsxRp2u+7htBPk4jFbg/HdgZDyluUEQgg0kvhIlq Fix build error without choose fec driver. Signed-off-by: Richard Zhao --- arch/arm/mach-imx/mach-imx6q.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c index d25c5d8..999de69 100644 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@ -60,6 +60,7 @@ soft: soft_restart(0); } +#if defined(CONFIG_FEC) || defined(CONFIG_FEC_MODULE) /* For imx6q sabrelite board: set KSZ9021RN RGMII pad skew */ static int ksz9021rn_phy_fixup(struct phy_device *phydev) { @@ -74,11 +75,14 @@ static int ksz9021rn_phy_fixup(struct phy_device *phydev) return 0; } +#endif static void __init imx6q_sabrelite_init(void) { +#if defined(CONFIG_FEC) || defined(CONFIG_FEC_MODULE) phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK, ksz9021rn_phy_fixup); +#endif } static void __init imx6q_init_machine(void)