From patchwork Fri Oct 9 12:53:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7361391 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EF661BEEA4 for ; Fri, 9 Oct 2015 12:57:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3106C206FA for ; Fri, 9 Oct 2015 12:57:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 51D612045A for ; Fri, 9 Oct 2015 12:57:12 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZkXC5-0002pc-Qc; Fri, 09 Oct 2015 12:54:41 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZkXC2-0002ej-SI for linux-arm-kernel@lists.infradead.org; Fri, 09 Oct 2015 12:54:39 +0000 Received: from wuerfel.localnet ([149.172.15.242]) by mrelayeu.kundenserver.de (mreue005) with ESMTPSA (Nemesis) id 0LqYLt-1aEu3g1EMD-00e5Rd; Fri, 09 Oct 2015 14:53:57 +0200 From: Arnd Bergmann To: netdev@vger.kernel.org Subject: [PATCH] net: HNS: fix MDIO dependencies Date: Fri, 09 Oct 2015 14:53:54 +0200 Message-ID: <8114651.XErShuFr2W@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:FHcOq5TXdY2Sq/vm5Zgy/yZnbzEjreC544c+sl/mu5vhrbTCzyE TLSI9li/xm31ecB/L5R7Q0zAEkt9GQEEXHOlyhvzX63HDcTFI8VCSbluGYdVYlQM7fhIPcc 7lIePU+57MqUyNG6b0XOkGexjAjd8F5zZw6KkZDo8kMCE6AFj61dfZbB/vA4VtAZdnYtNbJ z622pKvpzyqSRYofOw+QQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:90JF32xWQRA=:mNvlNTBK9HB2I72EyirnCP hQN2SuOc3JDFMCJLpz6W9nAnkxxj8jz3AZ/O5TqRw2OoPIYb1YfFU49MCsX3VQoWyh64Gnusn /UJeSd5IH8O9JETwVe/H58dsYrbn4PLHVOT72SC92H9b8USHVyevTrxgYlPuA7huqM5BkPhoZ SEX2MS1oSR6p2MzJp9ilckDQF8TQqbwgyHG2M1CaKOI4NqL9thqXY7b36hZkL/MnNVGTjIdiu CINscOskelSYqTjHENUlqshsp+wrkjFSJnLEgpChy0ZSDtKBstXRyJHdkuUZ3R1+wyvGOvL7S zerZozqGaEumE/dFPvG91UL0YqXvICkfYx/GLIdBrbOHCxGLdtFkPgFknby4Yt0JSzV6/V6So lZjfVcMWpkvJ0eBgFbqompGz9ubP75OpsZkNP099exlePj1oAaSm0DNeposBfq1pGs4FAyFYe EaIgMhAnuFZSo1i00UqOJ2Divs+ij9QPCMGalGQMv3WboPgzj6c8BpKVUrCGKA9iqCXDnRwt8 STOi2FeGMiMUKwvccKpAx5BT4pOglZkFBKi3KHZ7pjJgjn98MabAHj/eMEc0hM9jaHl1rUXXs /AWSh6TjXjJswzQgYE8wIpWCx3D3/PbyXqpUcylvcKImbmbtZUB65/tyk1fC6xqfWJwTLO3m9 T7i0g5wNTkTH1Nis+HpaMQGVB0rKUpKvMJV6LEMhHP0n+9oDV/PhF4b0H/9bfw/zgRJBY+ZLW BO7FyxMxX9E6YGpr X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151009_055439_103452_9D72CFA1 X-CRM114-Status: GOOD ( 16.73 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kenneth Lee , linux-kernel@vger.kernel.org, huangdaode , Zhangfei Gao , Yisen Zhuang , davem@davemloft.net, linux-arm-kernel@lists.infradead.org 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 The newly introduced HNS_MDIO Kconfig symbol selects 'MDIO', but that is the wrong symbol as the code used by this driver is provided by PHYLIB rather than the MDIO driver. Also, there is no need to make this driver user selectable, because it is already selected by all drivers that need it. This changes the Kconfig file to select the correct library, and to make the option silent. Signed-off-by: Arnd Bergmann Fixes: 5b904d39406 ("net: add Hisilicon Network Subsystem MDIO support") diff --git a/drivers/net/ethernet/hisilicon/Kconfig b/drivers/net/ethernet/hisilicon/Kconfig index 165b5a8aa2ea..8d12b587809e 100644 --- a/drivers/net/ethernet/hisilicon/Kconfig +++ b/drivers/net/ethernet/hisilicon/Kconfig @@ -24,7 +24,6 @@ config HIX5HD2_GMAC config HIP04_ETH tristate "HISILICON P04 Ethernet support" - select PHYLIB select MARVELL_PHY select MFD_SYSCON select HNS_MDIO @@ -33,8 +32,8 @@ config HIP04_ETH want to use the internal ethernet then you should answer Y to this. config HNS_MDIO - tristate "Hisilicon HNS MDIO device Support" - select MDIO + tristate + select PHYLIB ---help--- This selects the HNS MDIO support. It is needed by HNS_DSAF to access the PHY