GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 01:51:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: bcmgenet: remove PHY_BRCM_100MBPS_WAR

Browse source 
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>
This commit is contained in:
Florian Fainelli 2014-09-19 13:07:52 -07:00 • committed by David S. Miller
parent e18556ee3b
commit 80780a54ec
2 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/net/ethernet/broadcom/genet/bcmmii.c
View file

@ -296,7 +296,6 @@ static int bcmgenet_mii_probe(struct net_device *dev)
struct bcmgenet_priv *priv = netdev_priv(dev); struct bcmgenet_priv *priv = netdev_priv(dev);
struct device_node *dn = priv->pdev->dev.of_node; struct device_node *dn = priv->pdev->dev.of_node;
struct phy_device *phydev; struct phy_device *phydev;
unsigned int phy_flags;
int ret; int ret;
if (priv->phydev) { if (priv->phydev) {
@ -338,15 +337,6 @@ static int bcmgenet_mii_probe(struct net_device *dev)
return ret; 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; phydev->advertising = phydev->supported;
/* The internal PHY has its link interrupts routed to the /* The internal PHY has its link interrupts routed to the

1
include/linux/brcmphy.h
View file

@ -40,7 +40,6 @@
#define PHY_BRCM_CLEAR_RGMII_MODE 0x00004000 #define PHY_BRCM_CLEAR_RGMII_MODE 0x00004000
#define PHY_BRCM_DIS_TXCRXC_NOENRGY 0x00008000 #define PHY_BRCM_DIS_TXCRXC_NOENRGY 0x00008000
/* Broadcom BCM7xxx specific workarounds */ /* Broadcom BCM7xxx specific workarounds */
#define PHY_BRCM_100MBPS_WAR 0x00010000
#define PHY_BRCM_7XXX_REV(x) (((x) >> 8) & 0xff) #define PHY_BRCM_7XXX_REV(x) (((x) >> 8) & 0xff)
#define PHY_BRCM_7XXX_PATCH(x) ((x) & 0xff) #define PHY_BRCM_7XXX_PATCH(x) ((x) & 0xff)
#define PHY_BCM_FLAGS_VALID 0x80000000 #define PHY_BCM_FLAGS_VALID 0x80000000