Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80780a54 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: bcmgenet: remove PHY_BRCM_100MBPS_WAR 



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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e18556ee

drivers/net/ethernet/broadcom/genet/bcmmii.c

+0 −10
Original line number Diff line number Diff line
@@ -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) {
@@ -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

include/linux/brcmphy.h

+0 −1
Original line number Diff line number Diff line
@@ -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