From mboxrd@z Thu Jan 1 00:00:00 1970 From: Phil Reid Subject: Re: [PATCH 1/1] net: stmmac: Don't search for phys if mdio node is defined. Date: Wed, 16 Mar 2016 21:18:38 +0800 Message-ID: <56E95D2E.7010408@electromag.com.au> References: <1458027273-127737-1-git-send-email-preid@electromag.com.au> <1458027273-127737-2-git-send-email-preid@electromag.com.au> <56E9291E.6010503@st.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit To: Giuseppe CAVALLARO , netdev@vger.kernel.org Return-path: Received: from anchovy3.45ru.net.au ([203.30.46.155]:44100 "EHLO anchovy.45ru.net.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965649AbcCPNSp (ORCPT ); Wed, 16 Mar 2016 09:18:45 -0400 In-Reply-To: <56E9291E.6010503@st.com> Sender: netdev-owner@vger.kernel.org List-ID: On 16/03/2016 5:36 PM, Giuseppe CAVALLARO wrote: > On 3/15/2016 8:34 AM, Phil Reid wrote: >> If a dt mdio entry has been added least assume that we wont >> search for phys attached. The DT and of_mdiobus_register already do >> this. This stops DSA phys being found and phys created for them, as >> this is handled by the DSA driver. > > iiuc, this doesn't conflict with the recent rework we are doing > for the mdio/phy platform management. It should apply equally well before or after the rework. > >> Signed-off-by: Phil Reid > > Acked-by: Giuseppe Cavallaro > >> --- >> drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 4 ++++ >> 1 file changed, 4 insertions(+) >> >> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c >> index 3f5512f..06704ca 100644 >> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c >> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c >> @@ -235,6 +235,9 @@ int stmmac_mdio_register(struct net_device *ndev) >> goto bus_register_fail; >> } >> >> + if (priv->plat->phy_node || mdio_node) >> + goto bus_register_done; >> + >> found = 0; >> for (addr = 0; addr < PHY_MAX_ADDR; addr++) { >> struct phy_device *phydev = mdiobus_get_phy(new_bus, addr); >> @@ -290,6 +293,7 @@ int stmmac_mdio_register(struct net_device *ndev) >> return -ENODEV; >> } >> >> +bus_register_done: >> priv->mii = new_bus; >> >> return 0; >> > > > -- Regards Phil Reid ElectroMagnetic Imaging Technology Pty Ltd Development of Geophysical Instrumentation & Software www.electromag.com.au 3 The Avenue, Midland WA 6056, AUSTRALIA Ph: +61 8 9250 8100 Fax: +61 8 9250 7100 Email: preid@electromag.com.au