| Message ID | 20170125155411.14922-2-zajec5@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On 01/25/2017 07:54 AM, Rafał Miłecki wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > We had two defines for the same bit (both were used with the > MII_BCM54XX_AUXCTL_SHDWSEL_MISC register). > > Signed-off-by: Rafał Miłecki <rafal@milecki.pl> > --- > drivers/net/phy/broadcom.c | 2 +- > include/linux/brcmphy.h | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c > index 25c6e6cea2dc..9b7c2d57ca92 100644 > --- a/drivers/net/phy/broadcom.c > +++ b/drivers/net/phy/broadcom.c > @@ -42,7 +42,7 @@ static int bcm54810_config(struct phy_device *phydev) > return rc; > > val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC); > - val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN; > + val &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW; > val |= MII_BCM54XX_AUXCTL_MISC_WREN; > rc = bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, > val); > diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h > index 34e61004b9dc..bff53da82b58 100644 > --- a/include/linux/brcmphy.h > +++ b/include/linux/brcmphy.h > @@ -113,7 +113,6 @@ > #define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX 0x0200 > #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007 > #define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT 12 > -#define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN (1 << 8) > #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_WIRESPEED_EN (1 << 4) Please drop the other one and keep this one instead, the SHDWSEL prefix is intentional and correct here since it matches the datasheet.
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 25c6e6cea2dc..9b7c2d57ca92 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c @@ -42,7 +42,7 @@ static int bcm54810_config(struct phy_device *phydev) return rc; val = bcm54xx_auxctl_read(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC); - val &= ~MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN; + val &= ~MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW; val |= MII_BCM54XX_AUXCTL_MISC_WREN; rc = bcm54xx_auxctl_write(phydev, MII_BCM54XX_AUXCTL_SHDWSEL_MISC, val); diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index 34e61004b9dc..bff53da82b58 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -113,7 +113,6 @@ #define MII_BCM54XX_AUXCTL_MISC_FORCE_AMDIX 0x0200 #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007 #define MII_BCM54XX_AUXCTL_SHDWSEL_READ_SHIFT 12 -#define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_RGMII_SKEW_EN (1 << 8) #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC_WIRESPEED_EN (1 << 4) #define MII_BCM54XX_AUXCTL_SHDWSEL_MASK 0x0007