diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2014-09-19 13:07:53 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-09-19 16:27:07 -0400 |
| commit | 487320c541430a7a45eda668a26423e06eb32ad5 (patch) | |
| tree | 825b97af4b5c2aec31848cf92ab78c31a878abe3 /drivers/net/ethernet/broadcom/genet/bcmmii.c | |
| parent | net: bcmgenet: remove PHY_BRCM_100MBPS_WAR (diff) | |
| download | linux-dev-487320c541430a7a45eda668a26423e06eb32ad5.tar.xz linux-dev-487320c541430a7a45eda668a26423e06eb32ad5.zip | |
net: bcmgenet: communicate integrated PHY revision to PHY driver
The integrated BCM7xxx PHY contains no useful revision information in
its MII_PHYSID2 bits 3:0, that information is instead contained in the
GENET hardware block.
We already read the GENET 32-bit revision register, so store the
integrated PHY revision in the driver private structure, and then
communicate this revision value to the PHY driver by overriding the
phy_flags value.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/genet/bcmmii.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmmii.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c index 71f2ef7d33a9..75b26cbaa7c1 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -296,6 +296,7 @@ static int bcmgenet_mii_probe(struct net_device *dev) struct bcmgenet_priv *priv = netdev_priv(dev); struct device_node *dn = priv->pdev->dev.of_node; struct phy_device *phydev; + u32 phy_flags; int ret; if (priv->phydev) { @@ -314,8 +315,11 @@ static int bcmgenet_mii_probe(struct net_device *dev) priv->phy_dn = of_node_get(dn); } - phydev = of_phy_connect(dev, priv->phy_dn, bcmgenet_mii_setup, 0, - priv->phy_interface); + /* Communicate the integrated PHY revision */ + phy_flags = priv->gphy_rev; + + phydev = of_phy_connect(dev, priv->phy_dn, bcmgenet_mii_setup, + phy_flags, priv->phy_interface); if (!phydev) { pr_err("could not attach to PHY\n"); return -ENODEV; |