From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Burton Subject: [PATCH v6 3/6] net: pch_gbe: Support DeviceTree for MDIO/PHY description Date: Thu, 10 May 2018 16:16:54 -0700 Message-ID: <20180510231657.28503-4-paul.burton@mips.com> References: <20180510231657.28503-1-paul.burton@mips.com> Mime-Version: 1.0 Content-Type: text/plain Cc: , "David S . Miller" , Andrew Lunn , Paul Burton To: Return-path: Received: from 9pmail.ess.barracuda.com ([64.235.154.210]:51175 "EHLO 9pmail.ess.barracuda.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750751AbeEJXUw (ORCPT ); Thu, 10 May 2018 19:20:52 -0400 In-Reply-To: <20180510231657.28503-1-paul.burton@mips.com> Sender: netdev-owner@vger.kernel.org List-ID: When running on a system which uses device tree, use of_mdiobus_register() rather than plain mdiobus_register() in order to support parsing PHY information from the DT. On systems without CONFIG_OF_MDIO set of_mdiobus_register() falls back to mdiobus_register() anyway, but here we check for a non-NULL device node in order to continue functioning as-is if a system has CONFIG_OF_MDIO=y but doesn't use the devicetree. Signed-off-by: Paul Burton Cc: Andrew Lunn Cc: David S. Miller Cc: linux-mips@linux-mips.org Cc: netdev@vger.kernel.org --- Changes in v6: - New patch, significantly simplified by Andrew's preceding patches. Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index b20ed110cdef..f491044c2739 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c @@ -25,6 +25,7 @@ #include #include #include +#include #define DRV_VERSION "1.01" const char pch_driver_version[] = DRV_VERSION; @@ -829,6 +830,9 @@ static int pch_gbe_init_mdio(struct pch_gbe_adapter *adapter) adapter->mdiobus = bus; + if (dev->of_node) + return of_mdiobus_register(bus, dev->of_node); + return mdiobus_register(bus); } -- 2.17.0