From patchwork Wed Mar 19 19:29:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 3860591 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 74B3D9F334 for ; Wed, 19 Mar 2014 19:31:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7B3D3201F4 for ; Wed, 19 Mar 2014 19:31:11 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 843A820218 for ; Wed, 19 Mar 2014 19:31:10 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMCd-0007Xi-RO; Wed, 19 Mar 2014 19:31:03 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMCb-0005YT-3B; Wed, 19 Mar 2014 19:31:01 +0000 Received: from moutng.kundenserver.de ([212.227.17.24]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WQMCX-0005VN-4f for linux-arm-kernel@lists.infradead.org; Wed, 19 Mar 2014 19:30:58 +0000 Received: from wuerfel.lan (HSI-KBW-134-3-135-108.hsi14.kabel-badenwuerttemberg.de [134.3.135.108]) by mrelayeu.kundenserver.de (node=mreue105) with ESMTP (Nemesis) id 0MDxhX-1WL64U3NWx-00HQe9; Wed, 19 Mar 2014 20:30:34 +0100 From: Arnd Bergmann To: arm@kernel.org Subject: [PATCH 07/62] ARM: davinci: make dm644x-evm phy fixup conditional Date: Wed, 19 Mar 2014 20:29:04 +0100 Message-Id: <1395257399-359545-8-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395257399-359545-1-git-send-email-arnd@arndb.de> References: <1395257399-359545-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:D5GhcGu1KzhhaXIKhLNZ2DtDMQZs/ep3G5DgURDm9H6 QmtodBvhIvOI2S0aXV+Y3vhsSba+4vheA+cpSWd0Px2fdpdey8 EtSMcLAyfptvNtsQYTttc5cE+wfyfxd5O37WMAMbEXRJTTC9kA 7O/yPgLYwIlWT3cpu7RPV+2IdYEYZyl4TzDmclzF3mzJVmj1U+ PHlfru1gXRji4FcXwjxMDCT2bxA4UOqPMR4ZXCYuxdIFoegNFA gAF4/6gzHmSZ9WjS9AQqJXzspdwYVG85ABYp3ndYK2oV5tf9H2 GchzDP9FdpE0tt35FDkzBMoOwImEgNTJnz6k88vbHIw3AfgAFy 7aAal6k64zOsKiJmxKDU+i5XsKOS2CxP2LiP102yJ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140319_153057_425983_B36410CB X-CRM114-Status: GOOD ( 10.90 ) X-Spam-Score: -1.9 (-) Cc: Kevin Hilman , davinci-linux-open-source@linux.davincidsp.com, Sekhar Nori , Arnd Bergmann , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We cannot call phy_register_fixup_for_uid() if CONFIG_PHYLIB is not built into the kernel, and we should not enforce that to be built into vmlinux either, because one might want to disable the entire network stack. This change uses a compile-time condition on CONFIG_PHYLIB to remove the call in the cases where it cannot work. Signed-off-by: Arnd Bergmann Cc: Sekhar Nori Cc: Kevin Hilman Cc: davinci-linux-open-source@linux.davincidsp.com Acked-by: Sekhar Nori --- arch/arm/mach-davinci/board-dm644x-evm.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index 5602957..e583e58 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -804,11 +804,12 @@ static __init void davinci_evm_init(void) /* irlml6401 switches over 1A, in under 8 msec */ davinci_setup_usb(1000, 8); - soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID; - /* Register the fixup for PHY on DaVinci */ - phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK, - davinci_phy_fixup); - + if (IS_BUILTIN(CONFIG_PHYLIB)) { + soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID; + /* Register the fixup for PHY on DaVinci */ + phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK, + davinci_phy_fixup); + } } MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM")