From patchwork Tue Dec 29 14:05:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Perier X-Patchwork-Id: 561565 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 DC921140BB3 for ; Wed, 30 Dec 2015 01:05:44 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=J+RZip0a; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752973AbbL2OFk (ORCPT ); Tue, 29 Dec 2015 09:05:40 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:37662 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751817AbbL2OFi (ORCPT ); Tue, 29 Dec 2015 09:05:38 -0500 Received: by mail-wm0-f44.google.com with SMTP id f206so43226533wmf.0 for ; Tue, 29 Dec 2015 06:05:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=USFph0mN0cWslCGY51AxGVsbrstozoraFKaIxDqo7OE=; b=J+RZip0ahKHxGldANwokSAspFdjR4jGaO3dxqpR1x+6FRaEhgULVl0OlY5aIQaD09o Yfi9Zg/cJAPxYRWRCmSmPFaI4AsPcM2Jv9SnH68IOCewIpfBw9DT6ICZAiY1dcGUngGC 9jatB8GaqW8hQpnBwK9ebXNdPSNMnT6ozFEZ0nnIuBvMbeWkdqFd7TU4SHBP/4VxcRR3 V2ixvMpMmPupGGh3ey+ujUVRI6AAMiOyjLuIUW5XzPeIF9RUsWeIDJ1rt0DU/MU5OI/U ABZ3a5UK+vOTC5qC4bc5owIw+QxaWeiGtSvee+wbI4ZKM7nkNlo2WqDsyXWmi2sVumEt tjDA== X-Received: by 10.194.87.39 with SMTP id u7mr64047145wjz.11.1451397937574; Tue, 29 Dec 2015 06:05:37 -0800 (PST) Received: from localhost.localdomain (i19-les01-ntr-176-186-2-137.sfr.lns.abo.bbox.fr. [176.186.2.137]) by smtp.gmail.com with ESMTPSA id z127sm5787457wme.2.2015.12.29.06.05.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Dec 2015 06:05:36 -0800 (PST) From: Romain Perier To: peppe.cavallaro@st.com Cc: netdev@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH] stmmac: Don't exit mdio registration when mdio subnode is not found in the DTS Date: Tue, 29 Dec 2015 15:05:35 +0100 Message-Id: <1451397935-23643-1-git-send-email-romain.perier@gmail.com> X-Mailer: git-send-email 2.5.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Originally, most of the platforms using this driver did not define an mdio subnode in the devicetree. Commit e34d65 ("stmmac: create of compatible mdio bus for stmmac driver") introduced a backward compatibily issue by using of_mdiobus_register explicitly with an mdio subnode. This patch fixes the issue by calling the function mdiobus_register, when mdio subnode is not found. The driver is now compatible with both modes. Signed-off-by: Romain Perier --- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index 16c85cc..0034de44 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c @@ -218,8 +218,7 @@ int stmmac_mdio_register(struct net_device *ndev) if (mdio_node) { netdev_dbg(ndev, "FOUND MDIO subnode\n"); } else { - netdev_err(ndev, "NO MDIO subnode\n"); - return 0; + netdev_warn(ndev, "No MDIO subnode found\n"); } } @@ -251,7 +250,10 @@ int stmmac_mdio_register(struct net_device *ndev) new_bus->phy_mask = mdio_bus_data->phy_mask; new_bus->parent = priv->device; - err = of_mdiobus_register(new_bus, mdio_node); + if (IS_ENABLED(CONFIG_OF) && mdio_node) + err = of_mdiobus_register(new_bus, mdio_node); + else + err = mdiobus_register(new_bus); if (err != 0) { pr_err("%s: Cannot register as MDIO bus\n", new_bus->name); goto bus_register_fail;