diff options
author | David S. Miller <davem@davemloft.net> | 2011-07-21 23:18:00 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-21 23:18:00 -0700 |
commit | 97c7b1798f3de24315f0a3a7abcc7cf5de3285b9 (patch) | |
tree | 9d35320f2cd153359811980a4070eae766ce6646 /drivers/net/igb/e1000_defines.h | |
parent | e933d0198d399842f075c2c8af0f38630e7e4bee (diff) | |
parent | 082757afcf7d6e44b24c4927ce5b158196d63e84 (diff) | |
download | talos-obmc-linux-97c7b1798f3de24315f0a3a7abcc7cf5de3285b9.tar.gz talos-obmc-linux-97c7b1798f3de24315f0a3a7abcc7cf5de3285b9.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6
Diffstat (limited to 'drivers/net/igb/e1000_defines.h')
-rw-r--r-- | drivers/net/igb/e1000_defines.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/igb/e1000_defines.h b/drivers/net/igb/e1000_defines.h index 2cd4082c86ca..7b8ddd830f19 100644 --- a/drivers/net/igb/e1000_defines.h +++ b/drivers/net/igb/e1000_defines.h @@ -512,6 +512,16 @@ #define E1000_GCR_CMPL_TMOUT_RESEND 0x00010000 #define E1000_GCR_CAP_VER2 0x00040000 +/* mPHY Address Control and Data Registers */ +#define E1000_MPHY_ADDR_CTL 0x0024 /* mPHY Address Control Register */ +#define E1000_MPHY_ADDR_CTL_OFFSET_MASK 0xFFFF0000 +#define E1000_MPHY_DATA 0x0E10 /* mPHY Data Register */ + +/* mPHY PCS CLK Register */ +#define E1000_MPHY_PCS_CLK_REG_OFFSET 0x0004 /* mPHY PCS CLK AFE CSR Offset */ +/* mPHY Near End Digital Loopback Override Bit */ +#define E1000_MPHY_PCS_CLK_REG_DIGINELBEN 0x10 + /* PHY Control Register */ #define MII_CR_FULL_DUPLEX 0x0100 /* FDX =1, half duplex =0 */ #define MII_CR_RESTART_AUTO_NEG 0x0200 /* Restart auto negotiation */ |