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

Commit 8293c7bc authored by Rafał Miłecki's avatar Rafał Miłecki Committed by David S. Miller
Browse files

net: phy: broadcom: drop duplicated define for RGMII SKEW delay 



We had two defines for the same bit (both were used with the
MII_BCM54XX_AUXCTL_SHDWSEL_MISC register).

Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 85b4685d

drivers/net/phy/broadcom.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static int bcm54612e_config_aneg(struct phy_device *phydev) 
		reg = bcm54xx_auxctl_read(phydev,

					  MII_BCM54XX_AUXCTL_SHDWSEL_MISC);

		/* Disable RXD to RXC delay (default set) */

		reg &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW;

		reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN;

		/* Clear shadow selector field */

		reg &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MASK;

		bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC,

include/linux/brcmphy.h

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ 
#define MII_BCM54XX_AUXCTL_ACTL_SMDSP_ENA	0x0800



#define MII_BCM54XX_AUXCTL_MISC_WREN	0x8000

#define MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW	0x0100

#define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX	0x0200

#define MII_BCM54XX_AUXCTL_SHDWSEL_MISC	0x0007

#define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT	12