| Message ID | 1400708331-18088-5-git-send-email-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On 05/22/2014 01:38 AM, Florian Fainelli wrote: > of_phy_connect_fixed_link() is becoming obsolete, and also required > platform code to register the fixed PHYs at the specified addresses for > those to be usable. Get rid of it and use the new of_phy_is_fixed_link() > plus of_phy_register_fixed_link() helpers to transition over the new > scheme. > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > --- > drivers/net/ethernet/broadcom/bcmsysport.c | 17 +++++++++++++++-- > drivers/net/ethernet/broadcom/bcmsysport.h | 1 + > 2 files changed, 16 insertions(+), 2 deletions(-) > diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c > index d40c5b969e9e..dc708a888f80 100644 > --- a/drivers/net/ethernet/broadcom/bcmsysport.c > +++ b/drivers/net/ethernet/broadcom/bcmsysport.c > @@ -1327,8 +1327,8 @@ static int bcm_sysport_open(struct net_device *dev) > /* Read CRC forward */ > priv->crc_fwd = !!(umac_readl(priv, UMAC_CMD) & CMD_CRC_FWD); > > - priv->phydev = of_phy_connect_fixed_link(dev, bcm_sysport_adj_link, > - priv->phy_interface); > + priv->phydev = of_phy_connect(dev, priv->phy_dn, bcm_sysport_adj_link, > + 0, priv->phy_interface); The continuation line should start on the next character after ( on the above line, according to the networking coding style. [...] WBR, Sergei
2014-05-21 14:55 GMT-07:00 Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>: > On 05/22/2014 01:38 AM, Florian Fainelli wrote: > >> of_phy_connect_fixed_link() is becoming obsolete, and also required >> platform code to register the fixed PHYs at the specified addresses for >> those to be usable. Get rid of it and use the new of_phy_is_fixed_link() >> plus of_phy_register_fixed_link() helpers to transition over the new >> scheme. > > >> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> >> --- >> drivers/net/ethernet/broadcom/bcmsysport.c | 17 +++++++++++++++-- >> drivers/net/ethernet/broadcom/bcmsysport.h | 1 + >> 2 files changed, 16 insertions(+), 2 deletions(-) > > >> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c >> b/drivers/net/ethernet/broadcom/bcmsysport.c >> index d40c5b969e9e..dc708a888f80 100644 >> --- a/drivers/net/ethernet/broadcom/bcmsysport.c >> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c >> @@ -1327,8 +1327,8 @@ static int bcm_sysport_open(struct net_device *dev) >> /* Read CRC forward */ >> priv->crc_fwd = !!(umac_readl(priv, UMAC_CMD) & CMD_CRC_FWD); >> >> - priv->phydev = of_phy_connect_fixed_link(dev, >> bcm_sysport_adj_link, >> - >> priv->phy_interface); >> + priv->phydev = of_phy_connect(dev, priv->phy_dn, >> bcm_sysport_adj_link, >> + 0, priv->phy_interface); > > > The continuation line should start on the next character after ( on the > above line, according to the networking coding style. Unless I am once again not following the coding style, the patch in patchwork has this correctly, and so does my file locally: http://patchwork.ozlabs.org/patch/351323/
Hello. On 05/22/2014 02:02 AM, Florian Fainelli wrote: >>> of_phy_connect_fixed_link() is becoming obsolete, and also required >>> platform code to register the fixed PHYs at the specified addresses for >>> those to be usable. Get rid of it and use the new of_phy_is_fixed_link() >>> plus of_phy_register_fixed_link() helpers to transition over the new >>> scheme. >>> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> >>> --- >>> drivers/net/ethernet/broadcom/bcmsysport.c | 17 +++++++++++++++-- >>> drivers/net/ethernet/broadcom/bcmsysport.h | 1 + >>> 2 files changed, 16 insertions(+), 2 deletions(-) >>> diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c >>> b/drivers/net/ethernet/broadcom/bcmsysport.c >>> index d40c5b969e9e..dc708a888f80 100644 >>> --- a/drivers/net/ethernet/broadcom/bcmsysport.c >>> +++ b/drivers/net/ethernet/broadcom/bcmsysport.c >>> @@ -1327,8 +1327,8 @@ static int bcm_sysport_open(struct net_device *dev) >>> /* Read CRC forward */ >>> priv->crc_fwd = !!(umac_readl(priv, UMAC_CMD) & CMD_CRC_FWD); >>> >>> - priv->phydev = of_phy_connect_fixed_link(dev, >>> bcm_sysport_adj_link, >>> - >>> priv->phy_interface); >>> + priv->phydev = of_phy_connect(dev, priv->phy_dn, >>> bcm_sysport_adj_link, >>> + 0, priv->phy_interface); >> The continuation line should start on the next character after ( on the >> above line, according to the networking coding style. > Unless I am once again not following the coding style, the patch in > patchwork has this correctly, and so does my file locally: > http://patchwork.ozlabs.org/patch/351323/ Don't know about your local file but the patchwork still has the indentation wrong. -- you've used only tabs while the last several characters should have been spaces. However, if David himself finds it correct, I guess I just need to shut up. :-) WBR, Sergei
diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index d40c5b969e9e..dc708a888f80 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -1327,8 +1327,8 @@ static int bcm_sysport_open(struct net_device *dev) /* Read CRC forward */ priv->crc_fwd = !!(umac_readl(priv, UMAC_CMD) & CMD_CRC_FWD); - priv->phydev = of_phy_connect_fixed_link(dev, bcm_sysport_adj_link, - priv->phy_interface); + priv->phydev = of_phy_connect(dev, priv->phy_dn, bcm_sysport_adj_link, + 0, priv->phy_interface); if (!priv->phydev) { netdev_err(dev, "could not attach to PHY\n"); return -ENODEV; @@ -1551,6 +1551,19 @@ static int bcm_sysport_probe(struct platform_device *pdev) if (priv->phy_interface < 0) priv->phy_interface = PHY_INTERFACE_MODE_GMII; + /* In the case of a fixed PHY, the DT node associated + * to the PHY is the Ethernet MAC DT node. + */ + if (of_phy_is_fixed_link(dn)) { + ret = of_phy_register_fixed_link(dn); + if (ret) { + dev_err(&pdev->dev, "failed to register fixed PHY\n"); + goto err; + } + + priv->phy_dn = dn; + } + /* Initialize netdevice members */ macaddr = of_get_mac_address(dn); if (!macaddr || !is_valid_ether_addr(macaddr)) { diff --git a/drivers/net/ethernet/broadcom/bcmsysport.h b/drivers/net/ethernet/broadcom/bcmsysport.h index abdeb62616df..73fd04a94797 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.h +++ b/drivers/net/ethernet/broadcom/bcmsysport.h @@ -656,6 +656,7 @@ struct bcm_sysport_priv { unsigned int rx_c_index; /* PHY device */ + struct device_node *phy_dn; struct phy_device *phydev; phy_interface_t phy_interface; int old_pause;
of_phy_connect_fixed_link() is becoming obsolete, and also required platform code to register the fixed PHYs at the specified addresses for those to be usable. Get rid of it and use the new of_phy_is_fixed_link() plus of_phy_register_fixed_link() helpers to transition over the new scheme. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- drivers/net/ethernet/broadcom/bcmsysport.c | 17 +++++++++++++++-- drivers/net/ethernet/broadcom/bcmsysport.h | 1 + 2 files changed, 16 insertions(+), 2 deletions(-)