OSDN Git Service

net: phy: broadcom: Update Auxiliary Control Register macros
authorXo Wang <xow@google.com>
Fri, 21 Oct 2016 17:20:12 +0000 (10:20 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 26 Oct 2016 21:15:26 +0000 (17:15 -0400)
Add the RXD-to-RXC skew (delay) time bit in the Miscellaneous Control
shadow register and a mask for the shadow selector field.

Remove a re-definition of MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL.

Signed-off-by: Xo Wang <xow@google.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/brcmphy.h

index e3354b7..22c4421 100644 (file)
 #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_MISC_RDSEL_MISC     0x7000
 #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC        0x0007
 
-#define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL      0x0000
+#define MII_BCM54XX_AUXCTL_SHDWSEL_MASK        0x0007
 
 /*
  * Broadcom LED source encodings.  These are used in BCM5461, BCM5481,