Skip to content

Commit

Permalink
net: bcmgenet: remove PHY_BRCM_100MBPS_WAR
Browse files Browse the repository at this point in the history
Now that we have removed the need for the PHY_BRCM_100MBPS_WAR flag, we
can remove it from the GENET driver and the broadcom shared header file.
The PHY driver checks the PHY supported bitmask instead.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Sep 19, 2014
1 parent e18556e commit 80780a5
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
10 changes: 0 additions & 10 deletions drivers/net/ethernet/broadcom/genet/bcmmii.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,6 @@ 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;
unsigned int phy_flags;
int ret;

if (priv->phydev) {
Expand Down Expand Up @@ -338,15 +337,6 @@ static int bcmgenet_mii_probe(struct net_device *dev)
return ret;
}

phy_flags = PHY_BRCM_100MBPS_WAR;

/* workarounds are only needed for 100Mpbs PHYs, and
* never on GENET V1 hardware
*/
if ((phydev->supported & PHY_GBIT_FEATURES) || GENET_IS_V1(priv))
phy_flags = 0;

phydev->dev_flags |= phy_flags;
phydev->advertising = phydev->supported;

/* The internal PHY has its link interrupts routed to the
Expand Down
1 change: 0 additions & 1 deletion include/linux/brcmphy.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
#define PHY_BRCM_CLEAR_RGMII_MODE 0x00004000
#define PHY_BRCM_DIS_TXCRXC_NOENRGY 0x00008000
/* Broadcom BCM7xxx specific workarounds */
#define PHY_BRCM_100MBPS_WAR 0x00010000
#define PHY_BRCM_7XXX_REV(x) (((x) >> 8) & 0xff)
#define PHY_BRCM_7XXX_PATCH(x) ((x) & 0xff)
#define PHY_BCM_FLAGS_VALID 0x80000000
Expand Down

0 comments on commit 80780a5

Please sign in to comment.