Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757560AbcCXNAn (ORCPT ); Thu, 24 Mar 2016 09:00:43 -0400 Received: from mail-lb0-f172.google.com ([209.85.217.172]:33329 "EHLO mail-lb0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757319AbcCXNA0 (ORCPT ); Thu, 24 Mar 2016 09:00:26 -0400 Subject: Re: [PATCH] stmmac: Fix phy without MDIO subnode To: John Keeping , Giuseppe Cavallaro References: <1458817012-14293-1-git-send-email-john@metanate.com> Cc: Gabriel Fernandez , netdev@vger.kernel.org, linux-kernel@vger.kernel.org From: Sergei Shtylyov Message-ID: <56F3E4E7.6020608@cogentembedded.com> Date: Thu, 24 Mar 2016 16:00:23 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1458817012-14293-1-git-send-email-john@metanate.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1459 Lines: 33 Hello. On 3/24/2016 1:56 PM, John Keeping wrote: > Since commit 88f8b1bb41c6 ("stmmac: Fix 'eth0: No PHY found' > regression") we no longer allocate mdio_bus_data unless there is a MDIO > subnode. This breaks the ethernet on the Radxa Rock2 (using > rk3288-rock2-square.dts) which does not have an MDIO subnode. > > That commit was correct that the phy_bus_name test is unhelpful since we > allocate "plat" in the same function and never set phy_bus_name so let's > just drop the test which restores the previous behaviour. > > Fixes: 88f8b1bb41c6 ("stmmac: Fix 'eth0: No PHY found' regression") > Signed-off-by: John Keeping > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > index dcbd2a1..e0fa060 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > @@ -189,7 +189,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) > if (of_property_read_u32(np, "snps,phy-addr", &plat->phy_addr) == 0) > dev_warn(&pdev->dev, "snps,phy-addr property is deprecated\n"); > > - if ((plat->phy_node && !of_phy_is_fixed_link(np)) || !plat->mdio_node) > + if ((plat->phy_node && !of_phy_is_fixed_link(np))) Too many parens... MBR, Sergei