075-v4.10-0001-net-phy-broadcom-Update-Auxiliary-Control-Register-m.patch 1.2 KB

12345678910111213141516171819202122232425262728293031323334
  1. From: Xo Wang <xow@google.com>
  2. Date: Fri, 21 Oct 2016 10:20:12 -0700
  3. Subject: [PATCH] net: phy: broadcom: Update Auxiliary Control Register macros
  4. Add the RXD-to-RXC skew (delay) time bit in the Miscellaneous Control
  5. shadow register and a mask for the shadow selector field.
  6. Remove a re-definition of MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL.
  7. Signed-off-by: Xo Wang <xow@google.com>
  8. Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
  9. Reviewed-by: Joel Stanley <joel@jms.id.au>
  10. Signed-off-by: David S. Miller <davem@davemloft.net>
  11. ---
  12. --- a/include/linux/brcmphy.h
  13. +++ b/include/linux/brcmphy.h
  14. @@ -101,6 +101,7 @@
  15. * AUXILIARY CONTROL SHADOW ACCESS REGISTERS. (PHY REG 0x18)
  16. */
  17. #define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL 0x0000
  18. +#define MII_BCM54XX_AUXCTL_MISC_RXD_RXC_SKEW 0x0100
  19. #define MII_BCM54XX_AUXCTL_ACTL_TX_6DB 0x0400
  20. #define MII_BCM54XX_AUXCTL_ACTL_SMDSP_ENA 0x0800
  21. @@ -109,7 +110,7 @@
  22. #define MII_BCM54XX_AUXCTL_MISC_RDSEL_MISC 0x7000
  23. #define MII_BCM54XX_AUXCTL_SHDWSEL_MISC 0x0007
  24. -#define MII_BCM54XX_AUXCTL_SHDWSEL_AUXCTL 0x0000
  25. +#define MII_BCM54XX_AUXCTL_SHDWSEL_MASK 0x0007
  26. /*
  27. * Broadcom LED source encodings. These are used in BCM5461, BCM5481,