diff options
| author | David S. Miller <davem@davemloft.net> | 2016-10-26 17:15:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-26 17:15:27 -0400 |
| commit | f806f772470d4b95df62a5d0f6e6cad5ccf49480 (patch) | |
| tree | d233a27342fd93af2ae21ce576b5e7563b73c12f /include/linux | |
| parent | 73e42ff72a86e930dd873f47ea3029dc53f82c25 (diff) | |
| parent | d92ead16be405b6d52ff7b366d1c9865ccc684bd (diff) | |
| download | cachepc-linux-f806f772470d4b95df62a5d0f6e6cad5ccf49480.tar.gz cachepc-linux-f806f772470d4b95df62a5d0f6e6cad5ccf49480.zip | |
Merge branch 'BCM54612E'
Xo Wang says:
====================
Broadcom BCM54612E support
This series is based on tip of torvalds/master.
The first patch adds register definitions from Broadcom docs.
The second patch adds the BCM54612E PHY ID, flags, and device-specific
RGMII internal delay initialization.
I tested on a custom board with an Aspeed AST2500 SOC with its second
MAC connected to this PHY.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/brcmphy.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index e3354b74286c..60def78c4e12 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -18,6 +18,7 @@ #define PHY_ID_BCM5421 0x002060e0 #define PHY_ID_BCM5464 0x002060b0 #define PHY_ID_BCM5461 0x002060c0 +#define PHY_ID_BCM54612E 0x03625e60 #define PHY_ID_BCM54616S 0x03625d10 #define PHY_ID_BCM57780 0x03625d90 @@ -105,11 +106,12 @@ #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, |