From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753190Ab3H0H54 (ORCPT ); Tue, 27 Aug 2013 03:57:56 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:52932 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753134Ab3H0H5z (ORCPT ); Tue, 27 Aug 2013 03:57:55 -0400 Message-ID: <521C5C19.5070905@atmel.com> Date: Tue, 27 Aug 2013 09:58:17 +0200 From: Nicolas Ferre Organization: atmel User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 MIME-Version: 1.0 To: Boris BREZILLON CC: Rob Herring , Pawel Moll , Mark Rutland , Stephen Warren , Ian Campbell , Russell King , , , , Subject: Re: [PATCH v3 1/2] net/cadence/macb: add support for dt phy definition References: <1377589007-3684-1-git-send-email-b.brezillon@overkiz.com> <1377589070-3722-1-git-send-email-b.brezillon@overkiz.com> In-Reply-To: <1377589070-3722-1-git-send-email-b.brezillon@overkiz.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 27/08/2013 09:37, Boris BREZILLON : > The macb driver only handle PHY description through platform_data > (macb_platform_data). > Thus, when using dt you cannot define phy properties like phy address or > phy irq pin. > > This patch makes use of the of_mdiobus_register to add support for > phy device definition using dt. > A fallback to the autoscan procedure is added in case there is no phy > devices defined in dt. > > Signed-off-by: Boris BREZILLON Acked-by: Nicolas Ferre > --- > drivers/net/ethernet/cadence/macb.c | 48 +++++++++++++++++++++++++++-------- > 1 file changed, 38 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c > index e866608..393afeb 100644 > --- a/drivers/net/ethernet/cadence/macb.c > +++ b/drivers/net/ethernet/cadence/macb.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > #include > #include > > @@ -275,7 +276,7 @@ static int macb_mii_probe(struct net_device *dev) > phydev = phy_find_first(bp->mii_bus); > if (!phydev) { > netdev_err(dev, "no PHY found\n"); > - return -1; > + return -ENXIO; > } > > pdata = dev_get_platdata(&bp->pdev->dev); > @@ -314,6 +315,7 @@ static int macb_mii_probe(struct net_device *dev) > int macb_mii_init(struct macb *bp) > { > struct macb_platform_data *pdata; > + struct device_node *np; > int err = -ENXIO, i; > > /* Enable management port */ > @@ -335,26 +337,52 @@ int macb_mii_init(struct macb *bp) > bp->mii_bus->parent = &bp->dev->dev; > pdata = bp->pdev->dev.platform_data; > > - if (pdata) > - bp->mii_bus->phy_mask = pdata->phy_mask; > - > bp->mii_bus->irq = kmalloc(sizeof(int)*PHY_MAX_ADDR, GFP_KERNEL); > if (!bp->mii_bus->irq) { > err = -ENOMEM; > goto err_out_free_mdiobus; > } > > - for (i = 0; i < PHY_MAX_ADDR; i++) > - bp->mii_bus->irq[i] = PHY_POLL; > - > dev_set_drvdata(&bp->dev->dev, bp->mii_bus); > > - if (mdiobus_register(bp->mii_bus)) > + np = bp->pdev->dev.of_node; > + if (np) { > + /* try dt phy registration */ > + err = of_mdiobus_register(bp->mii_bus, np); > + > + /* fallback to standard phy registration if no phy were > + * found during dt phy registration > + */ > + if (!err && !phy_find_first(bp->mii_bus)) { > + for (i = 0; i < PHY_MAX_ADDR; i++) { > + struct phy_device *phydev; > + > + phydev = mdiobus_scan(bp->mii_bus, i); > + if (IS_ERR(phydev)) { > + err = PTR_ERR(phydev); > + break; > + } > + } > + > + if (err) > + goto err_out_unregister_bus; > + } > + } else { > + for (i = 0; i < PHY_MAX_ADDR; i++) > + bp->mii_bus->irq[i] = PHY_POLL; > + > + if (pdata) > + bp->mii_bus->phy_mask = pdata->phy_mask; > + > + err = mdiobus_register(bp->mii_bus); > + } > + > + if (err) > goto err_out_free_mdio_irq; > > - if (macb_mii_probe(bp->dev) != 0) { > + err = macb_mii_probe(bp->dev); > + if (err) > goto err_out_unregister_bus; > - } > > return 0; > > -- Nicolas Ferre